(camel) branch main updated: CAMEL-24103: camel-bean - Descriptive error for null CompletionStage return

[davsclaus]

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 5fd026e3ce5b CAMEL-24103: camel-bean - Descriptive error for null 
CompletionStage return
5fd026e3ce5b is described below

commit 5fd026e3ce5bc6221f9f2f888fc03bd426a063da
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Thu Jul 16 12:36:59 2026 +0200

    CAMEL-24103: camel-bean - Descriptive error for null CompletionStage return
    
    Co-Authored-By: Claude Opus 4.6 <nore...@anthropic.com>
    
    Signed-off-by: Claus Ibsen <claus.ib...@gmail.com>
    Co-authored-by: Claude Opus 4.6 <nore...@anthropic.com>
---
 .../apache/camel/component/bean/MethodInfo.java    |  5 ++
 .../bean/BeanNullCompletionStageTest.java          | 63 ++++++++++++++++++++++
 2 files changed, 68 insertions(+)

diff --git 
a/components/camel-bean/src/main/java/org/apache/camel/component/bean/MethodInfo.java
 
b/components/camel-bean/src/main/java/org/apache/camel/component/bean/MethodInfo.java
index ba17b054f4da..2bedda52521a 100644
--- 
a/components/camel-bean/src/main/java/org/apache/camel/component/bean/MethodInfo.java
+++ 
b/components/camel-bean/src/main/java/org/apache/camel/component/bean/MethodInfo.java
@@ -332,6 +332,11 @@ public class MethodInfo {
 
                 //If it's Java 8 async result
                 if 
(CompletionStage.class.isAssignableFrom(method.getReturnType())) {
+                    if (result == null) {
+                        throw new RuntimeCamelException(
+                                "Bean method " + 
method.getDeclaringClass().getName() + "." + method.getName()
+                                                        + " returned null 
CompletionStage");
+                    }
                     CompletionStage<?> completionStage = (CompletionStage<?>) 
result;
 
                     completionStage
diff --git 
a/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanNullCompletionStageTest.java
 
b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanNullCompletionStageTest.java
new file mode 100644
index 000000000000..da926fe86383
--- /dev/null
+++ 
b/core/camel-core/src/test/java/org/apache/camel/component/bean/BeanNullCompletionStageTest.java
@@ -0,0 +1,63 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.bean;
+
+import java.util.concurrent.CompletionStage;
+
+import org.apache.camel.CamelExecutionException;
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.RuntimeCamelException;
+import org.apache.camel.builder.RouteBuilder;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class BeanNullCompletionStageTest extends ContextTestSupport {
+
+    @Test
+    public void testNullCompletionStageGivesDescriptiveError() {
+        CamelExecutionException e = assertThrows(CamelExecutionException.class,
+                () -> template.sendBody("direct:start", "Hello"));
+
+        RuntimeCamelException cause = 
assertInstanceOf(RuntimeCamelException.class, e.getCause());
+        assertTrue(cause.getMessage().contains("returned null 
CompletionStage"),
+                "Error should mention null CompletionStage");
+        assertTrue(cause.getMessage().contains("doSomething"),
+                "Error should mention the method name");
+    }
+
+    @Override
+    protected RouteBuilder createRouteBuilder() {
+        return new RouteBuilder() {
+            @Override
+            public void configure() {
+                from("direct:start")
+                        .bean(MyNullFutureBean.class)
+                        .to("mock:result");
+            }
+        };
+    }
+
+    @SuppressWarnings("unused")
+    public static class MyNullFutureBean {
+        public CompletionStage<String> doSomething(String body) {
+            return null;
+        }
+    }
+}