You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2022/12/15 06:33:35 UTC
[camel] branch main updated: CAMEL-18812 Fix REST DSL configuration placeholder for id
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 a8a8ce89fff CAMEL-18812 Fix REST DSL configuration placeholder for id
a8a8ce89fff is described below
commit a8a8ce89fff34655c8d0c64c18d82cd358683c1d
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Dec 15 07:33:24 2022 +0100
CAMEL-18812 Fix REST DSL configuration placeholder for id
---
components/camel-spring-xml/src/test/resources/custom.properties | 1 +
.../org/apache/camel/component/rest/SpringFromRestGetTest.xml | 5 ++++-
.../camel/component/rest/SpringFromRestIdAndDescriptionTest.xml | 5 ++++-
3 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/components/camel-spring-xml/src/test/resources/custom.properties b/components/camel-spring-xml/src/test/resources/custom.properties
index 167bfe00e0e..c467b206384 100644
--- a/components/camel-spring-xml/src/test/resources/custom.properties
+++ b/components/camel-spring-xml/src/test/resources/custom.properties
@@ -15,3 +15,4 @@
## limitations under the License.
## ---------------------------------------------------------------------------
aggregation.timeout=1000
+mySpecialId=scott
\ No newline at end of file
diff --git a/components/camel-spring-xml/src/test/resources/org/apache/camel/component/rest/SpringFromRestGetTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/component/rest/SpringFromRestGetTest.xml
index 3680fe5f8ed..9ba95ed1fd6 100644
--- a/components/camel-spring-xml/src/test/resources/org/apache/camel/component/rest/SpringFromRestGetTest.xml
+++ b/components/camel-spring-xml/src/test/resources/org/apache/camel/component/rest/SpringFromRestGetTest.xml
@@ -29,13 +29,16 @@
<camelContext xmlns="http://camel.apache.org/schema/spring">
+ <propertyPlaceholder id="properties" location="custom.properties" ignoreMissingLocation="true">
+ </propertyPlaceholder>
+
<rest path="/say/hello">
<get>
<to uri="direct:hello"/>
</get>
</rest>
<rest path="/say/bye">
- <get consumes="application/json">
+ <get consumes="application/json" id="{{mySpecialId}}">
<param name="header_count" type="header" description="header param description1" dataType="integer" defaultValue="1" required="true">
<allowableValues>
<value>1</value>
diff --git a/components/camel-spring-xml/src/test/resources/org/apache/camel/component/rest/SpringFromRestIdAndDescriptionTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/component/rest/SpringFromRestIdAndDescriptionTest.xml
index 4cadf88cb01..cf0566fae00 100644
--- a/components/camel-spring-xml/src/test/resources/org/apache/camel/component/rest/SpringFromRestIdAndDescriptionTest.xml
+++ b/components/camel-spring-xml/src/test/resources/org/apache/camel/component/rest/SpringFromRestIdAndDescriptionTest.xml
@@ -29,6 +29,9 @@
<camelContext xmlns="http://camel.apache.org/schema/spring">
+ <propertyPlaceholder id="properties" location="custom.properties" ignoreMissingLocation="true">
+ </propertyPlaceholder>
+
<rest id="hello" path="/say/hello">
<description>Hello Service</description>
<get id="get-say">
@@ -38,7 +41,7 @@
</rest>
<rest id="bye" path="/say/bye">
<description lang="en">Bye Service</description>
- <get consumes="application/json">
+ <get consumes="application/json" id="{{mySpecialId}}">
<description>Says bye to you</description>
<param name="header_count" type="header" description="header param description1" dataType="integer" defaultValue="1" required="true">
<allowableValues>