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/02/18 12:01:42 UTC
[camel] 01/04: CAMEL-17673: camel-core-model - Cleanup Rest DSL
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
commit 6436d9c9735312ae5de9e17be49e9fa4bfed62b9
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri Feb 18 12:52:45 2022 +0100
CAMEL-17673: camel-core-model - Cleanup Rest DSL
---
.../jetty/rest/RestJettyBasicAuthTest.xml | 2 +-
.../apache/camel/openapi/RestOpenApiReader.java | 10 +++---
.../org/apache/camel/openapi/ComplexTypesTest.java | 2 +-
...SpringRestOpenApiReaderModelApiSecurityTest.xml | 4 +--
.../component/rest/SpringFromRestDuplicateTest.xml | 4 +--
.../component/rest/SpringFromRestUriPrefixTest.xml | 6 ++--
.../apache/camel/swagger/RestSwaggerReader.java | 10 +++---
...SpringRestSwaggerReaderModelApiSecurityTest.xml | 4 +--
.../test/resources/org/apache/camel/impl/rest1.xml | 2 +-
.../dsl/groovy/GroovyRouteBuilderLoaderTest.groovy | 4 +--
.../dsl/js/JavaScriptRoutesBuilderLoaderTest.java | 2 +-
.../dsl/kotlin/KotlinRoutesBuilderLoaderTest.kt | 4 +--
.../dsl/xml/io/XmlRoutesBuilderLoaderTest.java | 2 +-
.../org/apache/camel/dsl/xml/io/barRest.xml | 2 +-
.../org/apache/camel/main/xml/camel-rests.xml | 2 +-
.../camel/dsl/xml/jaxb/definition/barRest.xml | 2 +-
.../xml/jaxb/JaxbXmlRoutesBuilderLoaderTest.java | 2 +-
.../org/apache/camel/dsl/xml/jaxb/barRest.xml | 2 +-
.../org/apache/camel/main/xml/camel-rests.xml | 2 +-
.../org/apache/camel/dsl/yaml/RestTest.groovy | 20 +++++------
.../src/test/resources/routes/rest-dsl.yaml | 40 +++++++++++-----------
.../openapi/RestDefinitionEmitterTest.java | 2 +-
.../swagger/RestDefinitionEmitterTest.java | 2 +-
23 files changed, 66 insertions(+), 66 deletions(-)
diff --git a/components/camel-jetty/src/test/resources/org/apache/camel/component/jetty/rest/RestJettyBasicAuthTest.xml b/components/camel-jetty/src/test/resources/org/apache/camel/component/jetty/rest/RestJettyBasicAuthTest.xml
index a53b1a3..012f30c 100644
--- a/components/camel-jetty/src/test/resources/org/apache/camel/component/jetty/rest/RestJettyBasicAuthTest.xml
+++ b/components/camel-jetty/src/test/resources/org/apache/camel/component/jetty/rest/RestJettyBasicAuthTest.xml
@@ -66,7 +66,7 @@
<rest>
- <get uri="/ping">
+ <get path="/ping">
<route>
<setBody>
<constant>pong</constant>
diff --git a/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/RestOpenApiReader.java b/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/RestOpenApiReader.java
index 0fa99d5..d9e0597 100644
--- a/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/RestOpenApiReader.java
+++ b/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/RestOpenApiReader.java
@@ -503,7 +503,7 @@ public class RestOpenApiReader {
// the method must be in lower case
String method = verb.asVerb().toLowerCase(Locale.US);
// operation path is a key
- String opPath = OpenApiHelper.buildUrl(basePath, getValue(camelContext, verb.getUri()));
+ String opPath = OpenApiHelper.buildUrl(basePath, getValue(camelContext, verb.getPath()));
if (openApi.paths == null) {
openApi.paths = openApi.createPaths();
@@ -1498,14 +1498,14 @@ public class RestOpenApiReader {
@Override
public int compare(VerbDefinition a, VerbDefinition b) {
String u1 = "";
- if (a.getUri() != null) {
+ if (a.getPath() != null) {
// replace { with _ which comes before a when soring by char
- u1 = getValue(camelContext, a.getUri()).replace("{", "_");
+ u1 = getValue(camelContext, a.getPath()).replace("{", "_");
}
String u2 = "";
- if (b.getUri() != null) {
+ if (b.getPath() != null) {
// replace { with _ which comes before a when soring by char
- u2 = getValue(camelContext, b.getUri()).replace("{", "_");
+ u2 = getValue(camelContext, b.getPath()).replace("{", "_");
}
int num = u1.compareTo(u2);
diff --git a/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/ComplexTypesTest.java b/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/ComplexTypesTest.java
index 927cb72..e12f79f 100644
--- a/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/ComplexTypesTest.java
+++ b/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/ComplexTypesTest.java
@@ -119,7 +119,7 @@ public class ComplexTypesTest extends CamelTestSupport {
List<RestDefinition> rests = context.getRestDefinitions().stream()
// So we get the security schema and the route schema
- .filter(def -> def.getVerbs().isEmpty() || def.getVerbs().get(0).getUri().equals(uri))
+ .filter(def -> def.getVerbs().isEmpty() || def.getVerbs().get(0).getPath().equals(uri))
.collect(Collectors.toList());
RestOpenApiReader reader = new RestOpenApiReader();
diff --git a/components/camel-openapi-java/src/test/resources/org/apache/camel/openapi/SpringRestOpenApiReaderModelApiSecurityTest.xml b/components/camel-openapi-java/src/test/resources/org/apache/camel/openapi/SpringRestOpenApiReaderModelApiSecurityTest.xml
index cc5c91a..2b48097 100644
--- a/components/camel-openapi-java/src/test/resources/org/apache/camel/openapi/SpringRestOpenApiReaderModelApiSecurityTest.xml
+++ b/components/camel-openapi-java/src/test/resources/org/apache/camel/openapi/SpringRestOpenApiReaderModelApiSecurityTest.xml
@@ -38,7 +38,7 @@
<apiKey key="api_key" name="myHeader" inHeader="true"/>
</securityDefinitions>
- <get uri="/{id}/{date}" outType="org.apache.camel.openapi.User">
+ <get path="/{id}/{date}" outType="org.apache.camel.openapi.User">
<description>Find user by id and date</description>
<param name="id" type="path" description="The id of the user to get"/>
<param name="date" type="path" dataFormat="date" description="The date"/>
@@ -54,7 +54,7 @@
<to uri="bean:userService?method=updateUser"/>
</put>
- <get uri="/findAll" outType="org.apache.camel.openapi.User[]">
+ <get path="/findAll" outType="org.apache.camel.openapi.User[]">
<description>Find all users</description>
<responseMessage message="All the found users"/>
<to uri="bean:userService?method=listUsers"/>
diff --git a/components/camel-spring-xml/src/test/resources/org/apache/camel/component/rest/SpringFromRestDuplicateTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/component/rest/SpringFromRestDuplicateTest.xml
index c3a89e0..52ca673 100644
--- a/components/camel-spring-xml/src/test/resources/org/apache/camel/component/rest/SpringFromRestDuplicateTest.xml
+++ b/components/camel-spring-xml/src/test/resources/org/apache/camel/component/rest/SpringFromRestDuplicateTest.xml
@@ -30,7 +30,7 @@
<camelContext xmlns="http://camel.apache.org/schema/spring">
<rest path="/users">
- <get uri="{id}">
+ <get path="{id}">
<to uri="log:foo"/>
</get>
<post>
@@ -39,7 +39,7 @@
<get>
<to uri="log:foo"/>
</get>
- <get uri="{id}">
+ <get path="{id}">
<to uri="log:foo"/>
</get>
</rest>
diff --git a/components/camel-spring-xml/src/test/resources/org/apache/camel/component/rest/SpringFromRestUriPrefixTest.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/component/rest/SpringFromRestUriPrefixTest.xml
index ee129e3..8f04000 100644
--- a/components/camel-spring-xml/src/test/resources/org/apache/camel/component/rest/SpringFromRestUriPrefixTest.xml
+++ b/components/camel-spring-xml/src/test/resources/org/apache/camel/component/rest/SpringFromRestUriPrefixTest.xml
@@ -30,13 +30,13 @@
<camelContext xmlns="http://camel.apache.org/schema/spring">
<rest path="/say/">
- <get uri="/hello">
+ <get path="/hello">
<to uri="direct:hello"/>
</get>
- <get uri="/bye" consumes="application/json">
+ <get path="/bye" consumes="application/json">
<to uri="direct:bye"/>
</get>
- <post uri="/hi">
+ <post path="/hi">
<to uri="mock:update"/>
</post>
</rest>
diff --git a/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerReader.java b/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerReader.java
index f71d566..bbea58a 100644
--- a/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerReader.java
+++ b/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerReader.java
@@ -241,7 +241,7 @@ public class RestSwaggerReader {
// the method must be in lower case
String method = verb.asVerb().toLowerCase(Locale.US);
// operation path is a key
- String opPath = SwaggerHelper.buildUrl(basePath, verb.getUri());
+ String opPath = SwaggerHelper.buildUrl(basePath, verb.getPath());
Operation op = new Operation();
if (org.apache.camel.util.ObjectHelper.isNotEmpty(pathAsTag)) {
@@ -785,14 +785,14 @@ public class RestSwaggerReader {
public int compare(VerbDefinition a, VerbDefinition b) {
String u1 = "";
- if (a.getUri() != null) {
+ if (a.getPath() != null) {
// replace { with _ which comes before a when soring by char
- u1 = a.getUri().replace("{", "_");
+ u1 = a.getPath().replace("{", "_");
}
String u2 = "";
- if (b.getUri() != null) {
+ if (b.getPath() != null) {
// replace { with _ which comes before a when soring by char
- u2 = b.getUri().replace("{", "_");
+ u2 = b.getPath().replace("{", "_");
}
int num = u1.compareTo(u2);
diff --git a/components/camel-swagger-java/src/test/resources/org/apache/camel/swagger/SpringRestSwaggerReaderModelApiSecurityTest.xml b/components/camel-swagger-java/src/test/resources/org/apache/camel/swagger/SpringRestSwaggerReaderModelApiSecurityTest.xml
index ae5c087..1f93a1f 100644
--- a/components/camel-swagger-java/src/test/resources/org/apache/camel/swagger/SpringRestSwaggerReaderModelApiSecurityTest.xml
+++ b/components/camel-swagger-java/src/test/resources/org/apache/camel/swagger/SpringRestSwaggerReaderModelApiSecurityTest.xml
@@ -39,7 +39,7 @@
<apiKey key="api_key" name="myHeader" inHeader="true"/>
</securityDefinitions>
- <get uri="/{id}/{date}" outType="org.apache.camel.swagger.User">
+ <get path="/{id}/{date}" outType="org.apache.camel.swagger.User">
<description>Find user by id and date</description>
<param name="id" type="path" description="The id of the user to get"/>
<param name="date" type="path" dataFormat="date" description="The date"/>
@@ -55,7 +55,7 @@
<to uri="bean:userService?method=updateUser"/>
</put>
- <get uri="/findAll" outType="org.apache.camel.swagger.User[]">
+ <get path="/findAll" outType="org.apache.camel.swagger.User[]">
<description>Find all users</description>
<responseMessage message="All the found users"/>
<to uri="bean:userService?method=listUsers"/>
diff --git a/core/camel-core/src/test/resources/org/apache/camel/impl/rest1.xml b/core/camel-core/src/test/resources/org/apache/camel/impl/rest1.xml
index 698ebf3..62e135c 100644
--- a/core/camel-core/src/test/resources/org/apache/camel/impl/rest1.xml
+++ b/core/camel-core/src/test/resources/org/apache/camel/impl/rest1.xml
@@ -18,7 +18,7 @@
-->
<rest id="foo" path="/say/hello" xmlns="http://camel.apache.org/schema/spring">
- <get uri="/bar">
+ <get path="/bar">
<to uri="mock:bar"/>
</get>
</rest>
\ No newline at end of file
diff --git a/dsl/camel-groovy-dsl/camel-groovy-dsl-test/src/test/groovy/org/apache/camel/dsl/groovy/GroovyRouteBuilderLoaderTest.groovy b/dsl/camel-groovy-dsl/camel-groovy-dsl-test/src/test/groovy/org/apache/camel/dsl/groovy/GroovyRouteBuilderLoaderTest.groovy
index 9db3e3a..c9df201 100644
--- a/dsl/camel-groovy-dsl/camel-groovy-dsl-test/src/test/groovy/org/apache/camel/dsl/groovy/GroovyRouteBuilderLoaderTest.groovy
+++ b/dsl/camel-groovy-dsl/camel-groovy-dsl-test/src/test/groovy/org/apache/camel/dsl/groovy/GroovyRouteBuilderLoaderTest.groovy
@@ -85,7 +85,7 @@ class GroovyRouteBuilderLoaderTest extends Specification {
verbs.size() == 1
with(verbs.first(), GetDefinition) {
- uri == '/get'
+ path == '/get'
consumes == 'application/json'
produces == 'application/json'
@@ -99,7 +99,7 @@ class GroovyRouteBuilderLoaderTest extends Specification {
verbs.size() == 1
with(verbs.first(), PostDefinition) {
- uri == null
+ path == null
consumes == 'application/json'
produces == 'application/json'
diff --git a/dsl/camel-js-dsl/src/test/java/org/apache/camel/dsl/js/JavaScriptRoutesBuilderLoaderTest.java b/dsl/camel-js-dsl/src/test/java/org/apache/camel/dsl/js/JavaScriptRoutesBuilderLoaderTest.java
index 5a2ae37..7dc798a 100644
--- a/dsl/camel-js-dsl/src/test/java/org/apache/camel/dsl/js/JavaScriptRoutesBuilderLoaderTest.java
+++ b/dsl/camel-js-dsl/src/test/java/org/apache/camel/dsl/js/JavaScriptRoutesBuilderLoaderTest.java
@@ -113,7 +113,7 @@ public class JavaScriptRoutesBuilderLoaderTest {
assertThat(context.getRestDefinitions()).first().satisfies(d -> {
assertThat(d.getProduces()).isEqualTo("text/plain");
assertThat(d.getVerbs()).first().satisfies(v -> {
- assertThat(v.getUri()).isEqualTo("/say/hello");
+ assertThat(v.getPath()).isEqualTo("/say/hello");
});
});
assertThat(context.getRouteDefinitions()).first().satisfies(d -> {
diff --git a/dsl/camel-kotlin-dsl/src/test/kotlin/org/apache/camel/dsl/kotlin/KotlinRoutesBuilderLoaderTest.kt b/dsl/camel-kotlin-dsl/src/test/kotlin/org/apache/camel/dsl/kotlin/KotlinRoutesBuilderLoaderTest.kt
index 8fe5b05..569e53c 100644
--- a/dsl/camel-kotlin-dsl/src/test/kotlin/org/apache/camel/dsl/kotlin/KotlinRoutesBuilderLoaderTest.kt
+++ b/dsl/camel-kotlin-dsl/src/test/kotlin/org/apache/camel/dsl/kotlin/KotlinRoutesBuilderLoaderTest.kt
@@ -84,7 +84,7 @@ class KotlinRoutesBuilderLoaderTest {
assertThat(this?.verbs).hasSize(1)
with(this?.verbs?.get(0) as GetDefinition) {
- assertThat(uri).isEqualTo("/get")
+ assertThat(path).isEqualTo("/get")
assertThat(consumes).isEqualTo("application/json")
assertThat(produces).isEqualTo("application/json")
assertThat(to).hasFieldOrPropertyWithValue("endpointUri", "direct:get")
@@ -95,7 +95,7 @@ class KotlinRoutesBuilderLoaderTest {
assertThat(this?.verbs).hasSize(1)
with(this?.verbs?.get(0) as PostDefinition) {
- assertThat(uri).isNull()
+ assertThat(path).isNull()
assertThat(consumes).isEqualTo("application/json")
assertThat(produces).isEqualTo("application/json")
assertThat(to).hasFieldOrPropertyWithValue("endpointUri", "direct:post")
diff --git a/dsl/camel-xml-io-dsl/src/test/java/org/apache/camel/dsl/xml/io/XmlRoutesBuilderLoaderTest.java b/dsl/camel-xml-io-dsl/src/test/java/org/apache/camel/dsl/xml/io/XmlRoutesBuilderLoaderTest.java
index ef73bee..304b296 100644
--- a/dsl/camel-xml-io-dsl/src/test/java/org/apache/camel/dsl/xml/io/XmlRoutesBuilderLoaderTest.java
+++ b/dsl/camel-xml-io-dsl/src/test/java/org/apache/camel/dsl/xml/io/XmlRoutesBuilderLoaderTest.java
@@ -52,7 +52,7 @@ public class XmlRoutesBuilderLoaderTest {
String content = ""
+ "<rests xmlns=\"http://camel.apache.org/schema/spring\">"
+ " <rest id=\"bar\" path=\"/say/hello\">"
- + " <get uri=\"/bar\">"
+ + " <get path=\"/bar\">"
+ " <to uri=\"mock:bar\"/>"
+ " </get>"
+ " </rest>"
diff --git a/dsl/camel-xml-io-dsl/src/test/resources/org/apache/camel/dsl/xml/io/barRest.xml b/dsl/camel-xml-io-dsl/src/test/resources/org/apache/camel/dsl/xml/io/barRest.xml
index dc50305..e0fb9e4 100644
--- a/dsl/camel-xml-io-dsl/src/test/resources/org/apache/camel/dsl/xml/io/barRest.xml
+++ b/dsl/camel-xml-io-dsl/src/test/resources/org/apache/camel/dsl/xml/io/barRest.xml
@@ -19,7 +19,7 @@
-->
<rests xmlns="http://camel.apache.org/schema/spring">
<rest id="bar" path="/say/hello">
- <get uri="/bar">
+ <get path="/bar">
<to uri="mock:bar"/>
</get>
</rest>
diff --git a/dsl/camel-xml-io-dsl/src/test/resources/org/apache/camel/main/xml/camel-rests.xml b/dsl/camel-xml-io-dsl/src/test/resources/org/apache/camel/main/xml/camel-rests.xml
index 30a111a..d9c9f3a 100644
--- a/dsl/camel-xml-io-dsl/src/test/resources/org/apache/camel/main/xml/camel-rests.xml
+++ b/dsl/camel-xml-io-dsl/src/test/resources/org/apache/camel/main/xml/camel-rests.xml
@@ -19,7 +19,7 @@
-->
<rests xmlns="http://camel.apache.org/schema/spring">
<rest id="bar" path="/say/hello">
- <get uri="/bar">
+ <get path="/bar">
<to uri="mock:bar"/>
</get>
</rest>
diff --git a/dsl/camel-xml-jaxb-dsl-test/definition/src/test/resources/org/apache/camel/dsl/xml/jaxb/definition/barRest.xml b/dsl/camel-xml-jaxb-dsl-test/definition/src/test/resources/org/apache/camel/dsl/xml/jaxb/definition/barRest.xml
index dc50305..e0fb9e4 100644
--- a/dsl/camel-xml-jaxb-dsl-test/definition/src/test/resources/org/apache/camel/dsl/xml/jaxb/definition/barRest.xml
+++ b/dsl/camel-xml-jaxb-dsl-test/definition/src/test/resources/org/apache/camel/dsl/xml/jaxb/definition/barRest.xml
@@ -19,7 +19,7 @@
-->
<rests xmlns="http://camel.apache.org/schema/spring">
<rest id="bar" path="/say/hello">
- <get uri="/bar">
+ <get path="/bar">
<to uri="mock:bar"/>
</get>
</rest>
diff --git a/dsl/camel-xml-jaxb-dsl/src/test/java/org/apache/camel/dsl/xml/jaxb/JaxbXmlRoutesBuilderLoaderTest.java b/dsl/camel-xml-jaxb-dsl/src/test/java/org/apache/camel/dsl/xml/jaxb/JaxbXmlRoutesBuilderLoaderTest.java
index cc29677..56847e1 100644
--- a/dsl/camel-xml-jaxb-dsl/src/test/java/org/apache/camel/dsl/xml/jaxb/JaxbXmlRoutesBuilderLoaderTest.java
+++ b/dsl/camel-xml-jaxb-dsl/src/test/java/org/apache/camel/dsl/xml/jaxb/JaxbXmlRoutesBuilderLoaderTest.java
@@ -59,7 +59,7 @@ public class JaxbXmlRoutesBuilderLoaderTest {
private final String restsContent = ""
+ "<rests " + NAMESPACE_ATTRIBUTE + ">"
+ " <rest id=\"bar\" path=\"/say/hello\">"
- + " <get uri=\"/bar\">"
+ + " <get path=\"/bar\">"
+ " <to uri=\"mock:bar\"/>"
+ " </get>"
+ " </rest>"
diff --git a/dsl/camel-xml-jaxb-dsl/src/test/resources/org/apache/camel/dsl/xml/jaxb/barRest.xml b/dsl/camel-xml-jaxb-dsl/src/test/resources/org/apache/camel/dsl/xml/jaxb/barRest.xml
index dc50305..e0fb9e4 100644
--- a/dsl/camel-xml-jaxb-dsl/src/test/resources/org/apache/camel/dsl/xml/jaxb/barRest.xml
+++ b/dsl/camel-xml-jaxb-dsl/src/test/resources/org/apache/camel/dsl/xml/jaxb/barRest.xml
@@ -19,7 +19,7 @@
-->
<rests xmlns="http://camel.apache.org/schema/spring">
<rest id="bar" path="/say/hello">
- <get uri="/bar">
+ <get path="/bar">
<to uri="mock:bar"/>
</get>
</rest>
diff --git a/dsl/camel-xml-jaxb-dsl/src/test/resources/org/apache/camel/main/xml/camel-rests.xml b/dsl/camel-xml-jaxb-dsl/src/test/resources/org/apache/camel/main/xml/camel-rests.xml
index 30a111a..d9c9f3a 100644
--- a/dsl/camel-xml-jaxb-dsl/src/test/resources/org/apache/camel/main/xml/camel-rests.xml
+++ b/dsl/camel-xml-jaxb-dsl/src/test/resources/org/apache/camel/main/xml/camel-rests.xml
@@ -19,7 +19,7 @@
-->
<rests xmlns="http://camel.apache.org/schema/spring">
<rest id="bar" path="/say/hello">
- <get uri="/bar">
+ <get path="/bar">
<to uri="mock:bar"/>
</get>
</rest>
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/RestTest.groovy b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/RestTest.groovy
index ee117f9..aec575e 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/RestTest.groovy
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/RestTest.groovy
@@ -51,7 +51,7 @@ class RestTest extends YamlTestSupport {
type: ${MockRestConsumerFactory.name}
- rest:
get:
- - uri: "/foo"
+ - path: "/foo"
type: ${MyFooBar.name}
out-type: ${MyBean.name}
to: "direct:bar"
@@ -67,7 +67,7 @@ class RestTest extends YamlTestSupport {
verbs.size() == 1
with(verbs[0], VerbDefinition) {
- uri == '/foo'
+ path == '/foo'
type == MyFooBar.name
outType == MyBean.name
@@ -86,7 +86,7 @@ class RestTest extends YamlTestSupport {
type: ${MockRestConsumerFactory.name}
- rest:
get:
- - uri: "/foo"
+ - path: "/foo"
type: ${MyFooBar.name}
out-type: ${MyBean.name}
steps:
@@ -103,7 +103,7 @@ class RestTest extends YamlTestSupport {
verbs.size() == 1
with(verbs[0], VerbDefinition) {
- uri == '/foo'
+ path == '/foo'
type == MyFooBar.name
outType == MyBean.name
@@ -122,14 +122,14 @@ class RestTest extends YamlTestSupport {
type: ${MockRestConsumerFactory.name}
- rest:
post:
- - uri: "/foo"
+ - path: "/foo"
type: ${MyFooBar.name}
out-type: ${MyBean.name}
to: "direct:foo"
- - uri: "/baz"
+ - path: "/baz"
to: "direct:baz"
get:
- - uri: "/getFoo"
+ - path: "/getFoo"
to: "direct:getFoo"
- from:
uri: 'direct:bar'
@@ -143,7 +143,7 @@ class RestTest extends YamlTestSupport {
verbs.size() == 3
with(verbs[0], PostDefinition) {
- uri == '/foo'
+ path == '/foo'
type == MyFooBar.name
outType == MyBean.name
@@ -152,13 +152,13 @@ class RestTest extends YamlTestSupport {
}
}
with(verbs[1], PostDefinition) {
- uri == '/baz'
+ path == '/baz'
with(to, ToDefinition) {
endpointUri == 'direct:baz'
}
}
with(verbs[2], GetDefinition) {
- uri == '/getFoo'
+ path == '/getFoo'
with(to, ToDefinition) {
endpointUri == 'direct:getFoo'
}
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/resources/routes/rest-dsl.yaml b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/resources/routes/rest-dsl.yaml
index 25084c3..c6fd731 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/resources/routes/rest-dsl.yaml
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/resources/routes/rest-dsl.yaml
@@ -3,7 +3,7 @@
put:
- consumes: "application/json,application/xml"
id: "updatePet"
- uri: "/pet"
+ path: "/pet"
param:
- name: "body"
required: true
@@ -12,7 +12,7 @@
uri: "direct:updatePet"
- consumes: "*/*"
id: "updateUser"
- uri: "/user/{username}"
+ path: "/user/{username}"
param:
- dataType: "string"
name: "username"
@@ -26,7 +26,7 @@
post:
- consumes: "application/json,application/xml"
id: "addPet"
- uri: "/pet"
+ path: "/pet"
param:
- dataType: "boolean"
defaultValue: "false"
@@ -42,7 +42,7 @@
uri: "direct:addPet"
- consumes: "application/x-www-form-urlencoded"
id: "updatePetWithForm"
- uri: "/pet/{petId}"
+ path: "/pet/{petId}"
param:
- dataType: "integer"
description: "ID of pet that needs to be updated"
@@ -64,7 +64,7 @@
- consumes: "multipart/form-data"
id: "uploadFile"
produces: "application/json"
- uri: "/pet/{petId}/uploadImage"
+ path: "/pet/{petId}/uploadImage"
param:
- dataType: "integer"
description: "ID of pet to update"
@@ -86,7 +86,7 @@
- consumes: "*/*"
id: "placeOrder"
produces: "application/xml,application/json"
- uri: "/store/order"
+ path: "/store/order"
param:
- description: "order placed for purchasing the pet"
name: "body"
@@ -96,7 +96,7 @@
uri: "direct:placeOrder"
- consumes: "*/*"
id: "createUser"
- uri: "/user"
+ path: "/user"
description: "This can only be done by the logged in user."
param:
- description: "Created user object"
@@ -107,7 +107,7 @@
uri: "direct:createUser"
- consumes: "*/*"
id: "createUsersWithArrayInput"
- uri: "/user/createWithArray"
+ path: "/user/createWithArray"
param:
- description: "List of user object"
name: "body"
@@ -117,7 +117,7 @@
uri: "direct:createUsersWithArrayInput"
- consumes: "*/*"
id: "createUsersWithListInput"
- uri: "/user/createWithList"
+ path: "/user/createWithList"
param:
- description: "List of user object"
name: "body"
@@ -128,7 +128,7 @@
get:
- id: "findPetsByStatus"
produces: "application/xml,application/json"
- uri: "/pet/findByStatus"
+ path: "/pet/findByStatus"
description: "Multiple status values can be provided with comma separated strings"
param:
- arrayType: "string"
@@ -142,7 +142,7 @@
uri: "direct:findPetsByStatus"
- id: "findPetsByTags"
produces: "application/xml,application/json"
- uri: "/pet/findByTags"
+ path: "/pet/findByTags"
description: "Muliple tags can be provided with comma separated strings. Use\
\ tag1, tag2, tag3 for testing."
param:
@@ -157,7 +157,7 @@
uri: "direct:findPetsByTags"
- id: "getPetById"
produces: "application/xml,application/json"
- uri: "/pet/{petId}"
+ path: "/pet/{petId}"
description: "Returns a single pet"
param:
- dataType: "integer"
@@ -169,13 +169,13 @@
uri: "direct:getPetById"
- id: "getInventory"
produces: "application/json"
- uri: "/store/inventory"
+ path: "/store/inventory"
description: "Returns a map of status codes to quantities"
to:
uri: "direct:getInventory"
- id: "getOrderById"
produces: "application/xml,application/json"
- uri: "/store/order/{orderId}"
+ path: "/store/order/{orderId}"
description: "For valid response try integer IDs with value >= 1 and <= 10.\
\ Other values will generated exceptions"
param:
@@ -188,7 +188,7 @@
uri: "direct:getOrderById"
- id: "loginUser"
produces: "application/xml,application/json"
- uri: "/user/login"
+ path: "/user/login"
param:
- dataType: "string"
description: "The user name for login"
@@ -203,12 +203,12 @@
to:
uri: "direct:loginUser"
- id: "logoutUser"
- uri: "/user/logout"
+ path: "/user/logout"
to:
uri: "direct:logoutUser"
- id: "getUserByName"
produces: "application/xml,application/json"
- uri: "/user/{username}"
+ path: "/user/{username}"
param:
- dataType: "string"
description: "The name that needs to be fetched. Use user1 for testing. "
@@ -219,7 +219,7 @@
uri: "direct:getUserByName"
delete:
- id: "deletePet"
- uri: "/pet/{petId}"
+ path: "/pet/{petId}"
param:
- dataType: "string"
name: "api_key"
@@ -233,7 +233,7 @@
to:
uri: "direct:deletePet"
- id: "deleteOrder"
- uri: "/store/order/{orderId}"
+ path: "/store/order/{orderId}"
description: "For valid response try integer IDs with positive integer value.\
\ Negative or non-integer values will generate API errors"
param:
@@ -245,7 +245,7 @@
to:
uri: "direct:deleteOrder"
- id: "deleteUser"
- uri: "/user/{username}"
+ path: "/user/{username}"
description: "This can only be done by the logged in user."
param:
- dataType: "string"
diff --git a/tooling/openapi-rest-dsl-generator/src/test/java/org/apache/camel/generator/openapi/RestDefinitionEmitterTest.java b/tooling/openapi-rest-dsl-generator/src/test/java/org/apache/camel/generator/openapi/RestDefinitionEmitterTest.java
index 6e7e645..8a7229a 100644
--- a/tooling/openapi-rest-dsl-generator/src/test/java/org/apache/camel/generator/openapi/RestDefinitionEmitterTest.java
+++ b/tooling/openapi-rest-dsl-generator/src/test/java/org/apache/camel/generator/openapi/RestDefinitionEmitterTest.java
@@ -56,7 +56,7 @@ public class RestDefinitionEmitterTest {
final VerbDefinition definition = verbs.get(0);
assertThat(definition.asVerb()).isEqualTo("put");
- assertThat(definition.getUri()).isEqualTo("/pet");
+ assertThat(definition.getPath()).isEqualTo("/pet");
assertThat(definition.getConsumes()).isEqualTo("application/json,application/xml");
assertThat(definition.getProduces()).isEqualTo("application/xml,application/json");
diff --git a/tooling/swagger-rest-dsl-generator/src/test/java/org/apache/camel/generator/swagger/RestDefinitionEmitterTest.java b/tooling/swagger-rest-dsl-generator/src/test/java/org/apache/camel/generator/swagger/RestDefinitionEmitterTest.java
index 05fc66e..7af5859 100644
--- a/tooling/swagger-rest-dsl-generator/src/test/java/org/apache/camel/generator/swagger/RestDefinitionEmitterTest.java
+++ b/tooling/swagger-rest-dsl-generator/src/test/java/org/apache/camel/generator/swagger/RestDefinitionEmitterTest.java
@@ -55,7 +55,7 @@ public class RestDefinitionEmitterTest {
final VerbDefinition definition = verbs.get(0);
assertThat(definition.asVerb()).isEqualTo("put");
- assertThat(definition.getUri()).isEqualTo("/pet");
+ assertThat(definition.getPath()).isEqualTo("/pet");
assertThat(definition.getConsumes()).isEqualTo("application/json,application/xml");
assertThat(definition.getProduces()).isEqualTo("application/xml,application/json");