(camel) branch var updated: CAMEL-22018: camel-core - Exchange.getVariables should include message headers

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch var
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/var by this push:
     new fc0011c22ff CAMEL-22018: camel-core - Exchange.getVariables should 
include message headers
fc0011c22ff is described below

commit fc0011c22ff7b0e91e6576ef0509f07c969afaf1
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Thu Apr 24 21:27:36 2025 +0200

    CAMEL-22018: camel-core - Exchange.getVariables should include message 
headers
---
 core/camel-api/src/main/java/org/apache/camel/Exchange.java       | 2 +-
 core/camel-api/src/main/java/org/apache/camel/Variables.java      | 2 +-
 .../test/java/org/apache/camel/language/simple/SimpleTest.java    | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/core/camel-api/src/main/java/org/apache/camel/Exchange.java 
b/core/camel-api/src/main/java/org/apache/camel/Exchange.java
index 9d0a5a7272f..ab55b6ac7e7 100644
--- a/core/camel-api/src/main/java/org/apache/camel/Exchange.java
+++ b/core/camel-api/src/main/java/org/apache/camel/Exchange.java
@@ -534,7 +534,7 @@ public interface Exchange extends VariableAware {
     /**
      * Returns the variables from the current exchange
      *
-     * @return the variables from the current exchange in a Map
+     * @return the variables from the current exchange in a Map.
      */
     Map<String, Object> getVariables();
 
diff --git a/core/camel-api/src/main/java/org/apache/camel/Variables.java 
b/core/camel-api/src/main/java/org/apache/camel/Variables.java
index 9feeb2830ab..30e9ccfd7f2 100644
--- a/core/camel-api/src/main/java/org/apache/camel/Variables.java
+++ b/core/camel-api/src/main/java/org/apache/camel/Variables.java
@@ -23,7 +23,7 @@ import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
 /**
- * Marks a parameter as being an injection point of the variables (read-only)
+ * Marks a parameter as being an injection point of the variables
  *
  * @see Exchange#getVariables()
  */
diff --git 
a/core/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java
 
b/core/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java
index aed165d3392..c6a2d27650a 100644
--- 
a/core/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java
+++ 
b/core/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java
@@ -946,7 +946,7 @@ public class SimpleTest extends LanguageTestSupport {
 
     @Test
     public void testVariables() {
-        exchange.getMessage().getHeaders().forEach(exchange::setVariable);
+        exchange.getVariables().putAll(exchange.getMessage().getHeaders());
         exchange.getMessage().removeHeaders("*");
 
         Map<String, Object> variables = exchange.getVariables();
@@ -991,11 +991,11 @@ public class SimpleTest extends LanguageTestSupport {
 
     @Test
     public void testVariableKeyWithSpace() {
-        exchange.getMessage().getHeaders().forEach(exchange::setVariable);
+        exchange.getVariables().putAll(exchange.getMessage().getHeaders());
         exchange.getMessage().removeHeaders("*");
 
         Map<String, Object> variables = exchange.getVariables();
-        exchange.setVariable("some key", "Some Value");
+        variables.put("some key", "Some Value");
         assertEquals(4, variables.size());
 
         assertExpression("${variableAs(foo,String)}", "abc");
@@ -1015,7 +1015,7 @@ public class SimpleTest extends LanguageTestSupport {
 
     @Test
     public void testVariableAs() {
-        exchange.getMessage().getHeaders().forEach(exchange::setVariable);
+        exchange.getVariables().putAll(exchange.getMessage().getHeaders());
         exchange.getMessage().removeHeaders("*");
 
         assertExpression("${variableAs(foo,String)}", "abc");