(camel) branch main updated: CAMEL-22136: camel-rest - Allow to use variables in {xxx} placeholder syntax for the producer

[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 46a081dfaee CAMEL-22136: camel-rest - Allow to use variables in {xxx} 
placeholder syntax for the producer
46a081dfaee is described below

commit 46a081dfaee9ee08ab118fa4ea57e829c7fe2d4a
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Wed Jun 4 13:26:46 2025 +0200

    CAMEL-22136: camel-rest - Allow to use variables in {xxx} placeholder 
syntax for the producer
---
 .../camel/component/rest/RestProducerTest.java     | 41 +++++++++++-----------
 1 file changed, 21 insertions(+), 20 deletions(-)

diff --git 
a/core/camel-core/src/test/java/org/apache/camel/component/rest/RestProducerTest.java
 
b/core/camel-core/src/test/java/org/apache/camel/component/rest/RestProducerTest.java
index 3547b5c2d0c..bb1a5866ed9 100644
--- 
a/core/camel-core/src/test/java/org/apache/camel/component/rest/RestProducerTest.java
+++ 
b/core/camel-core/src/test/java/org/apache/camel/component/rest/RestProducerTest.java
@@ -23,6 +23,7 @@ import java.util.Collections;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.impl.DefaultCamelContext;
+import org.apache.camel.support.DefaultExchange;
 import org.apache.camel.support.DefaultMessage;
 import org.junit.jupiter.api.Test;
 
@@ -35,18 +36,18 @@ public class RestProducerTest {
 
     @Test
     public void shouldCreateMultipleQueryParameters() throws 
UnsupportedEncodingException, URISyntaxException {
-        final DefaultMessage message = new DefaultMessage(camelContext);
-        message.setHeader("multiple", Arrays.asList("value1", "value2", 
"value3"));
+        DefaultExchange exchange = new DefaultExchange(camelContext);
+        exchange.getMessage().setHeader("multiple", Arrays.asList("value1", 
"value2", "value3"));
 
-        assertEquals("param=value1&param=value2&param=value3", 
RestProducer.createQueryParameters("param={multiple}", message));
+        assertEquals("param=value1&param=value2&param=value3", 
RestProducer.createQueryParameters("param={multiple}", exchange));
     }
 
     @Test
     public void shouldCreateMultipleOptionalQueryParameters() throws 
UnsupportedEncodingException, URISyntaxException {
-        final DefaultMessage message = new DefaultMessage(camelContext);
-        message.setHeader("multiple", Collections.EMPTY_LIST);
+        DefaultExchange exchange = new DefaultExchange(camelContext);
+        exchange.getMessage().setHeader("multiple", Collections.EMPTY_LIST);
 
-        assertEquals("", 
RestProducer.createQueryParameters("multiple={multiple?}", message));
+        assertEquals("", 
RestProducer.createQueryParameters("multiple={multiple?}", exchange));
     }
 
     @Test
@@ -57,18 +58,18 @@ public class RestProducerTest {
     @Test
     public void 
shouldCreateOptionalPlaceholderQueryParametersForPresentValues()
             throws UnsupportedEncodingException, URISyntaxException {
-        final DefaultMessage message = new DefaultMessage(camelContext);
-        message.setHeader("paramPlaceholderName", "paramValue");
+        DefaultExchange exchange = new DefaultExchange(camelContext);
+        exchange.getMessage().setHeader("paramPlaceholderName", "paramValue");
 
-        assertEquals("param=paramValue", 
RestProducer.createQueryParameters("param={paramPlaceholderName?}", message));
+        assertEquals("param=paramValue", 
RestProducer.createQueryParameters("param={paramPlaceholderName?}", exchange));
     }
 
     @Test
     public void shouldCreatePlaceholderQueryParameters() throws 
UnsupportedEncodingException, URISyntaxException {
-        final DefaultMessage message = new DefaultMessage(camelContext);
-        message.setHeader("paramPlaceholderName", "paramValue");
+        DefaultExchange exchange = new DefaultExchange(camelContext);
+        exchange.getMessage().setHeader("paramPlaceholderName", "paramValue");
 
-        assertEquals("param=paramValue", 
RestProducer.createQueryParameters("param={paramPlaceholderName}", message));
+        assertEquals("param=paramValue", 
RestProducer.createQueryParameters("param={paramPlaceholderName}", exchange));
     }
 
     @Test
@@ -79,18 +80,18 @@ public class RestProducerTest {
     @Test
     public void 
shouldNotCreateOptionalPlaceholderQueryParametersForMissingValues()
             throws UnsupportedEncodingException, URISyntaxException {
-        final DefaultMessage message = new DefaultMessage(camelContext);
+        DefaultExchange exchange = new DefaultExchange(camelContext);
 
-        assertEquals("", 
RestProducer.createQueryParameters("param={paramPlaceholderName?}", message));
+        assertEquals("", 
RestProducer.createQueryParameters("param={paramPlaceholderName?}", exchange));
     }
 
     @Test
     public void shouldSupportAllCombinations() throws 
UnsupportedEncodingException, URISyntaxException {
-        final DefaultMessage message = new DefaultMessage(camelContext);
-        message.setHeader("requiredParamPlaceholder", "header_required_value");
-        message.setHeader("optionalPresentParamPlaceholder", 
"header_optional_present_value");
-        message.setHeader("multiple", Arrays.asList("value1", "value2", 
"value3"));
-        message.setHeader("multipleOptional", Collections.EMPTY_LIST);
+        DefaultExchange exchange = new DefaultExchange(camelContext);
+        exchange.getMessage().setHeader("requiredParamPlaceholder", 
"header_required_value");
+        exchange.getMessage().setHeader("optionalPresentParamPlaceholder", 
"header_optional_present_value");
+        exchange.getMessage().setHeader("multiple", Arrays.asList("value1", 
"value2", "value3"));
+        exchange.getMessage().setHeader("multipleOptional", 
Collections.EMPTY_LIST);
 
         assertEquals("given=value"
                      + "&required=header_required_value"
@@ -102,6 +103,6 @@ public class RestProducerTest {
                                                    + 
"&optional_present={optionalPresentParamPlaceholder?}"
                                                    + "&multiple={multiple}"
                                                    + 
"&multipleOptional={multipleOptional?}",
-                        message));
+                        exchange));
     }
 }