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 5ab1e77 CAMEL-17701: camel-core-model - Add labels to EIP options
5ab1e77 is described below
commit 5ab1e7783431ceebab3b7f143650a51837745d55
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Tue Mar 1 15:06:38 2022 +0100
CAMEL-17701: camel-core-model - Add labels to EIP options
---
.../main/camel-main-configuration-metadata.json | 1 -
.../camel/catalog/models/restConfiguration.json | 1 -
.../apache/camel/catalog/schemas/camel-spring.xsd | 8 ------
.../helper/CamelJavaRestDslParserHelper.java | 6 ----
.../parser/helper/CamelXmlRestDslParserHelper.java | 3 --
.../parser/model/RestConfigurationDetails.java | 27 ------------------
.../org/apache/camel/spi/RestConfiguration.java | 16 -----------
.../camel/impl/RestConfigurationConfigurer.java | 6 ----
.../apache/camel/model/rest/restConfiguration.json | 1 -
.../model/rest/RestConfigurationDefinition.java | 32 ----------------------
.../apache/camel/model/rest/RestDefinition.java | 6 +---
.../RestConfigurationPropertiesConfigurer.java | 6 ----
.../camel-main-configuration-metadata.json | 1 -
core/camel-main/src/main/docs/main.adoc | 3 +-
.../camel/main/RestConfigurationProperties.java | 10 -------
.../java/org/apache/camel/xml/in/ModelParser.java | 1 -
.../dsl/yaml/deserializers/ModelDeserializers.java | 6 ----
.../src/generated/resources/camel-yaml-dsl.json | 3 --
.../src/generated/resources/camelYamlDsl.json | 3 --
19 files changed, 2 insertions(+), 138 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/camel-main-configuration-metadata.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/camel-main-configuration-metadata.json
index 6b352f8..5b98061 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/camel-main-configuration-metadata.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/camel-main-configuration-metadata.json
@@ -195,7 +195,6 @@
{ "name": "camel.resilience4j.writableStackTraceEnabled", "description":
"Enables writable stack traces. When set to false, Exception.getStackTrace
returns a zero length array. This may be used to reduce log spam when the
circuit breaker is open as the cause of the exceptions is already known (the
circuit breaker is short-circuiting calls).", "sourceType":
"org.apache.camel.main.Resilience4jConfigurationProperties", "type": "boolean",
"javaType": "java.lang.Boolean", "defaultValue": [...]
{ "name": "camel.rest.apiComponent", "description": "Sets the name of the
Camel component to use as the REST API (such as swagger or openapi)",
"sourceType": "org.apache.camel.spi.RestConfiguration", "type": "string",
"javaType": "java.lang.String" },
{ "name": "camel.rest.apiContextPath", "description": "Sets a leading API
context-path the REST API services will be using. This can be used when using
components such as camel-servlet where the deployed web application is deployed
using a context-path.", "sourceType": "org.apache.camel.spi.RestConfiguration",
"type": "string", "javaType": "java.lang.String" },
- { "name": "camel.rest.apiContextRouteId", "description": "Sets the route
id to use for the route that services the REST API. The route will by default
use an auto assigned route id.", "sourceType":
"org.apache.camel.spi.RestConfiguration", "type": "string", "javaType":
"java.lang.String" },
{ "name": "camel.rest.apiHost", "description": "To use a specific hostname
for the API documentation (such as swagger or openapi) This can be used to
override the generated host with this configured hostname", "sourceType":
"org.apache.camel.spi.RestConfiguration", "type": "string", "javaType":
"java.lang.String" },
{ "name": "camel.rest.apiProperties", "description": "Sets additional
options on api level", "sourceType": "org.apache.camel.spi.RestConfiguration",
"type": "object", "javaType": "java.util.Map" },
{ "name": "camel.rest.apiVendorExtension", "description": "Whether vendor
extension is enabled in the Rest APIs. If enabled then Camel will include
additional information as vendor extension (eg keys starting with x-) such as
route ids, class names etc. Not all 3rd party API gateways and tools supports
vendor-extensions when importing your API docs.", "sourceType":
"org.apache.camel.spi.RestConfiguration", "type": "boolean", "javaType":
"boolean", "defaultValue": "false" },
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/restConfiguration.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/restConfiguration.json
index 4e4c0d3..582ff5e 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/restConfiguration.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/restConfiguration.json
@@ -23,7 +23,6 @@
"producerApiDoc": { "kind": "attribute", "displayName": "Producer Api
Doc", "label": "producer,advanced", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "description": "Sets the location of the api document the REST
producer will use to validate the REST uri and query parameters are valid
accordingly to the api document. The location of the api document is loaded
from classpath by default, but you can use [...]
"contextPath": { "kind": "attribute", "displayName": "Context Path",
"label": "consumer", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "Sets a leading context-path the REST services will be using.
This can be used when using components such as camel-servlet where the deployed
web application is deployed using a context-path. Or for components such as
camel-jetty or camel-netty-http that i [...]
"apiContextPath": { "kind": "attribute", "displayName": "Api Context
Path", "label": "consumer", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "Sets a leading API context-path the REST API services will be
using. This can be used when using components such as camel-servlet where the
deployed web application is deployed using a context-path." },
- "apiContextRouteId": { "kind": "attribute", "displayName": "Api Context
Route Id", "label": "consumer,advanced", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": true, "autowired": false,
"secret": false, "description": "Sets the route id to use for the route that
services the REST API. The route will by default use an auto assigned route
id." },
"apiVendorExtension": { "kind": "attribute", "displayName": "Api Vendor
Extension", "label": "consumer,advanced", "required": false, "type": "boolean",
"javaType": "java.lang.Boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "description": "Whether vendor
extension is enabled in the Rest APIs. If enabled then Camel will include
additional information as vendor extension (eg keys starting with x-) such as
route ids, class names etc. Not all 3rd [...]
"hostNameResolver": { "kind": "attribute", "displayName": "Host Name
Resolver", "label": "consumer,advanced", "required": false, "type": "enum",
"javaType": "org.apache.camel.model.rest.RestHostNameResolver", "enum": [
"all-local-ip", "local-host-name", "local-ip" ], "deprecated": false,
"autowired": false, "secret": false, "defaultValue": "allLocalIp",
"description": "If no hostname has been explicit configured, then this resolver
is used to compute the hostname the REST service wil [...]
"bindingMode": { "kind": "attribute", "displayName": "Binding Mode",
"required": false, "type": "enum", "javaType":
"org.apache.camel.model.rest.RestBindingMode", "enum": [ "off", "auto", "json",
"xml", "json_xml" ], "deprecated": false, "autowired": false, "secret": false,
"defaultValue": "off", "description": "Sets the binding mode to use. The
default value is off" },
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
index c156d6f..f397503 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
@@ -14527,14 +14527,6 @@ application is deployed using a context-path.
]]></xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute name="apiContextRouteId" type="xs:string">
- <xs:annotation>
- <xs:documentation xml:lang="en"><![CDATA[
-Deprecated: Sets the route id to use for the route that services the REST API.
-The route will by default use an auto assigned route id.
- ]]></xs:documentation>
- </xs:annotation>
- </xs:attribute>
<xs:attribute name="apiVendorExtension" type="xs:boolean">
<xs:annotation>
<xs:documentation xml:lang="en"><![CDATA[
diff --git
a/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/helper/CamelJavaRestDslParserHelper.java
b/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/helper/CamelJavaRestDslParserHelper.java
index bc04be9..de0bb81 100644
---
a/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/helper/CamelJavaRestDslParserHelper.java
+++
b/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/helper/CamelJavaRestDslParserHelper.java
@@ -279,12 +279,6 @@ public final class CamelJavaRestDslParserHelper {
node.setContextPath(extractValueFromFirstArgument(clazz, block,
mi));
} else if ("apiContextPath".equals(name)) {
node.setApiContextPath(extractValueFromFirstArgument(clazz, block,
mi));
- } else if ("apiContextRouteId".equals(name)) {
- node.setApiContextRouteId(extractValueFromFirstArgument(clazz,
block, mi));
- } else if ("apiContextIdPattern".equals(name)) {
- node.setApiContextIdPattern(extractValueFromFirstArgument(clazz,
block, mi));
- } else if ("apiContextListening".equals(name)) {
- node.setApiContextListening(extractValueFromFirstArgument(clazz,
block, mi));
} else if ("apiVendorExtension".equals(name)) {
node.setApiVendorExtension(extractValueFromFirstArgument(clazz,
block, mi));
} else if ("hostNameResolver".equals(name)) {
diff --git
a/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/helper/CamelXmlRestDslParserHelper.java
b/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/helper/CamelXmlRestDslParserHelper.java
index d3f9e1b..9704ecb 100644
---
a/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/helper/CamelXmlRestDslParserHelper.java
+++
b/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/helper/CamelXmlRestDslParserHelper.java
@@ -71,9 +71,6 @@ public final class CamelXmlRestDslParserHelper {
detail.setProducerApiDoc(extractAttribute(map, "producerApiDoc"));
detail.setContextPath(extractAttribute(map, "contextPath"));
detail.setApiContextPath(extractAttribute(map, "apiContextPath"));
- detail.setApiContextRouteId(extractAttribute(map,
"apiContextRouteId"));
- detail.setApiContextIdPattern(extractAttribute(map,
"apiContextIdPattern"));
- detail.setApiContextListening(extractAttribute(map,
"apiContextListening"));
detail.setApiVendorExtension(extractAttribute(map,
"apiVendorExtension"));
detail.setHostNameResolver(extractAttribute(map,
"hostNameResolver"));
detail.setBindingMode(extractAttribute(map, "bindingMode"));
diff --git
a/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/model/RestConfigurationDetails.java
b/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/model/RestConfigurationDetails.java
index 661f80a..0760e6d 100644
---
a/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/model/RestConfigurationDetails.java
+++
b/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/model/RestConfigurationDetails.java
@@ -42,9 +42,6 @@ public class RestConfigurationDetails {
private String producerApiDoc;
private String contextPath;
private String apiContextPath;
- private String apiContextRouteId;
- private String apiContextIdPattern;
- private String apiContextListening;
private String apiVendorExtension;
private String hostNameResolver;
private String bindingMode;
@@ -191,30 +188,6 @@ public class RestConfigurationDetails {
this.apiContextPath = apiContextPath;
}
- public String getApiContextRouteId() {
- return apiContextRouteId;
- }
-
- public void setApiContextRouteId(String apiContextRouteId) {
- this.apiContextRouteId = apiContextRouteId;
- }
-
- public String getApiContextIdPattern() {
- return apiContextIdPattern;
- }
-
- public void setApiContextIdPattern(String apiContextIdPattern) {
- this.apiContextIdPattern = apiContextIdPattern;
- }
-
- public String getApiContextListening() {
- return apiContextListening;
- }
-
- public void setApiContextListening(String apiContextListening) {
- this.apiContextListening = apiContextListening;
- }
-
public String getApiVendorExtension() {
return apiVendorExtension;
}
diff --git
a/core/camel-api/src/main/java/org/apache/camel/spi/RestConfiguration.java
b/core/camel-api/src/main/java/org/apache/camel/spi/RestConfiguration.java
index 57a3332..7de9c03 100644
--- a/core/camel-api/src/main/java/org/apache/camel/spi/RestConfiguration.java
+++ b/core/camel-api/src/main/java/org/apache/camel/spi/RestConfiguration.java
@@ -59,7 +59,6 @@ public class RestConfiguration {
private int port;
private String contextPath;
private String apiContextPath;
- private String apiContextRouteId;
private boolean apiVendorExtension;
private RestHostNameResolver hostNameResolver =
RestHostNameResolver.allLocalIp;
private RestBindingMode bindingMode = RestBindingMode.off;
@@ -274,21 +273,6 @@ public class RestConfiguration {
this.apiContextPath = contextPath;
}
- public String getApiContextRouteId() {
- return apiContextRouteId;
- }
-
- /**
- * Sets the route id to use for the route that services the REST API.
- * <p/>
- * The route will by default use an auto assigned route id.
- *
- * @param apiContextRouteId the route id
- */
- public void setApiContextRouteId(String apiContextRouteId) {
- this.apiContextRouteId = apiContextRouteId;
- }
-
public boolean isApiVendorExtension() {
return apiVendorExtension;
}
diff --git
a/core/camel-core-engine/src/generated/java/org/apache/camel/impl/RestConfigurationConfigurer.java
b/core/camel-core-engine/src/generated/java/org/apache/camel/impl/RestConfigurationConfigurer.java
index 7e65601..fa27564 100644
---
a/core/camel-core-engine/src/generated/java/org/apache/camel/impl/RestConfigurationConfigurer.java
+++
b/core/camel-core-engine/src/generated/java/org/apache/camel/impl/RestConfigurationConfigurer.java
@@ -25,8 +25,6 @@ public class RestConfigurationConfigurer extends
org.apache.camel.support.compon
case "ApiComponent": target.setApiComponent(property(camelContext,
java.lang.String.class, value)); return true;
case "apicontextpath":
case "ApiContextPath": target.setApiContextPath(property(camelContext,
java.lang.String.class, value)); return true;
- case "apicontextrouteid":
- case "ApiContextRouteId":
target.setApiContextRouteId(property(camelContext, java.lang.String.class,
value)); return true;
case "apihost":
case "ApiHost": target.setApiHost(property(camelContext,
java.lang.String.class, value)); return true;
case "apiproperties":
@@ -84,8 +82,6 @@ public class RestConfigurationConfigurer extends
org.apache.camel.support.compon
case "ApiComponent": return java.lang.String.class;
case "apicontextpath":
case "ApiContextPath": return java.lang.String.class;
- case "apicontextrouteid":
- case "ApiContextRouteId": return java.lang.String.class;
case "apihost":
case "ApiHost": return java.lang.String.class;
case "apiproperties":
@@ -144,8 +140,6 @@ public class RestConfigurationConfigurer extends
org.apache.camel.support.compon
case "ApiComponent": return target.getApiComponent();
case "apicontextpath":
case "ApiContextPath": return target.getApiContextPath();
- case "apicontextrouteid":
- case "ApiContextRouteId": return target.getApiContextRouteId();
case "apihost":
case "ApiHost": return target.getApiHost();
case "apiproperties":
diff --git
a/core/camel-core-model/src/generated/resources/org/apache/camel/model/rest/restConfiguration.json
b/core/camel-core-model/src/generated/resources/org/apache/camel/model/rest/restConfiguration.json
index 4e4c0d3..582ff5e 100644
---
a/core/camel-core-model/src/generated/resources/org/apache/camel/model/rest/restConfiguration.json
+++
b/core/camel-core-model/src/generated/resources/org/apache/camel/model/rest/restConfiguration.json
@@ -23,7 +23,6 @@
"producerApiDoc": { "kind": "attribute", "displayName": "Producer Api
Doc", "label": "producer,advanced", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "description": "Sets the location of the api document the REST
producer will use to validate the REST uri and query parameters are valid
accordingly to the api document. The location of the api document is loaded
from classpath by default, but you can use [...]
"contextPath": { "kind": "attribute", "displayName": "Context Path",
"label": "consumer", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "Sets a leading context-path the REST services will be using.
This can be used when using components such as camel-servlet where the deployed
web application is deployed using a context-path. Or for components such as
camel-jetty or camel-netty-http that i [...]
"apiContextPath": { "kind": "attribute", "displayName": "Api Context
Path", "label": "consumer", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "Sets a leading API context-path the REST API services will be
using. This can be used when using components such as camel-servlet where the
deployed web application is deployed using a context-path." },
- "apiContextRouteId": { "kind": "attribute", "displayName": "Api Context
Route Id", "label": "consumer,advanced", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": true, "autowired": false,
"secret": false, "description": "Sets the route id to use for the route that
services the REST API. The route will by default use an auto assigned route
id." },
"apiVendorExtension": { "kind": "attribute", "displayName": "Api Vendor
Extension", "label": "consumer,advanced", "required": false, "type": "boolean",
"javaType": "java.lang.Boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "description": "Whether vendor
extension is enabled in the Rest APIs. If enabled then Camel will include
additional information as vendor extension (eg keys starting with x-) such as
route ids, class names etc. Not all 3rd [...]
"hostNameResolver": { "kind": "attribute", "displayName": "Host Name
Resolver", "label": "consumer,advanced", "required": false, "type": "enum",
"javaType": "org.apache.camel.model.rest.RestHostNameResolver", "enum": [
"all-local-ip", "local-host-name", "local-ip" ], "deprecated": false,
"autowired": false, "secret": false, "defaultValue": "allLocalIp",
"description": "If no hostname has been explicit configured, then this resolver
is used to compute the hostname the REST service wil [...]
"bindingMode": { "kind": "attribute", "displayName": "Binding Mode",
"required": false, "type": "enum", "javaType":
"org.apache.camel.model.rest.RestBindingMode", "enum": [ "off", "auto", "json",
"xml", "json_xml" ], "deprecated": false, "autowired": false, "secret": false,
"defaultValue": "off", "description": "Sets the binding mode to use. The
default value is off" },
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/model/rest/RestConfigurationDefinition.java
b/core/camel-core-model/src/main/java/org/apache/camel/model/rest/RestConfigurationDefinition.java
index 5b762c0..bb946a0 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/model/rest/RestConfigurationDefinition.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/model/rest/RestConfigurationDefinition.java
@@ -71,10 +71,6 @@ public class RestConfigurationDefinition {
@Metadata(label = "consumer")
private String apiContextPath;
@XmlAttribute
- @Metadata(label = "consumer,advanced")
- @Deprecated
- private String apiContextRouteId;
- @XmlAttribute
@Metadata(label = "consumer,advanced", javaType = "java.lang.Boolean",
defaultValue = "false")
private Boolean apiVendorExtension;
@XmlAttribute
@@ -255,23 +251,6 @@ public class RestConfigurationDefinition {
this.apiContextPath = contextPath;
}
- @Deprecated
- public String getApiContextRouteId() {
- return apiContextRouteId;
- }
-
- /**
- * Sets the route id to use for the route that services the REST API.
- * <p/>
- * The route will by default use an auto assigned route id.
- *
- * @param apiContextRouteId the route id
- */
- @Deprecated
- public void setApiContextRouteId(String apiContextRouteId) {
- this.apiContextRouteId = apiContextRouteId;
- }
-
public Boolean getApiVendorExtension() {
return apiVendorExtension;
}
@@ -558,14 +537,6 @@ public class RestConfigurationDefinition {
}
/**
- * Sets the route id to use for the route that services the REST API.
- */
- public RestConfigurationDefinition apiContextRouteId(String routeId) {
- setApiContextRouteId(routeId);
- return this;
- }
-
- /**
* Whether vendor extension is enabled in the Rest APIs. If enabled then
Camel will include additional information
* as vendor extension (eg keys starting with x-) such as route ids, class
names etc. Some API tooling may not
* support vendor extensions and this option can then be turned off.
@@ -799,9 +770,6 @@ public class RestConfigurationDefinition {
if (apiContextPath != null) {
target.setApiContextPath(CamelContextHelper.parseText(context,
apiContextPath));
}
- if (apiContextRouteId != null) {
- target.setApiContextRouteId(CamelContextHelper.parseText(context,
apiContextRouteId));
- }
if (apiVendorExtension != null) {
target.setApiVendorExtension(apiVendorExtension);
}
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/model/rest/RestDefinition.java
b/core/camel-core-model/src/main/java/org/apache/camel/model/rest/RestDefinition.java
index b562807..954be24 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/model/rest/RestDefinition.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/model/rest/RestDefinition.java
@@ -731,11 +731,7 @@ public class RestDefinition extends
OptionalIdentifiedDefinition<RestDefinition>
// create the from endpoint uri which is using the rest-api component
String from = "rest-api:" + configuration.getApiContextPath();
-
- String routeId = configuration.getApiContextRouteId();
- if (routeId == null) {
- routeId =
answer.idOrCreate(camelContext.adapt(ExtendedCamelContext.class).getNodeIdFactory());
- }
+ String routeId =
answer.idOrCreate(camelContext.adapt(ExtendedCamelContext.class).getNodeIdFactory());
// append options
Map<String, Object> options = new HashMap<>();
diff --git
a/core/camel-main/src/generated/java/org/apache/camel/main/RestConfigurationPropertiesConfigurer.java
b/core/camel-main/src/generated/java/org/apache/camel/main/RestConfigurationPropertiesConfigurer.java
index 7abc251..25b9e82 100644
---
a/core/camel-main/src/generated/java/org/apache/camel/main/RestConfigurationPropertiesConfigurer.java
+++
b/core/camel-main/src/generated/java/org/apache/camel/main/RestConfigurationPropertiesConfigurer.java
@@ -25,8 +25,6 @@ public class RestConfigurationPropertiesConfigurer extends
org.apache.camel.supp
case "ApiComponent": target.setApiComponent(property(camelContext,
java.lang.String.class, value)); return true;
case "apicontextpath":
case "ApiContextPath": target.setApiContextPath(property(camelContext,
java.lang.String.class, value)); return true;
- case "apicontextrouteid":
- case "ApiContextRouteId":
target.setApiContextRouteId(property(camelContext, java.lang.String.class,
value)); return true;
case "apihost":
case "ApiHost": target.setApiHost(property(camelContext,
java.lang.String.class, value)); return true;
case "apiproperties":
@@ -84,8 +82,6 @@ public class RestConfigurationPropertiesConfigurer extends
org.apache.camel.supp
case "ApiComponent": return java.lang.String.class;
case "apicontextpath":
case "ApiContextPath": return java.lang.String.class;
- case "apicontextrouteid":
- case "ApiContextRouteId": return java.lang.String.class;
case "apihost":
case "ApiHost": return java.lang.String.class;
case "apiproperties":
@@ -144,8 +140,6 @@ public class RestConfigurationPropertiesConfigurer extends
org.apache.camel.supp
case "ApiComponent": return target.getApiComponent();
case "apicontextpath":
case "ApiContextPath": return target.getApiContextPath();
- case "apicontextrouteid":
- case "ApiContextRouteId": return target.getApiContextRouteId();
case "apihost":
case "ApiHost": return target.getApiHost();
case "apiproperties":
diff --git
a/core/camel-main/src/generated/resources/META-INF/camel-main-configuration-metadata.json
b/core/camel-main/src/generated/resources/META-INF/camel-main-configuration-metadata.json
index 6b352f8..5b98061 100644
---
a/core/camel-main/src/generated/resources/META-INF/camel-main-configuration-metadata.json
+++
b/core/camel-main/src/generated/resources/META-INF/camel-main-configuration-metadata.json
@@ -195,7 +195,6 @@
{ "name": "camel.resilience4j.writableStackTraceEnabled", "description":
"Enables writable stack traces. When set to false, Exception.getStackTrace
returns a zero length array. This may be used to reduce log spam when the
circuit breaker is open as the cause of the exceptions is already known (the
circuit breaker is short-circuiting calls).", "sourceType":
"org.apache.camel.main.Resilience4jConfigurationProperties", "type": "boolean",
"javaType": "java.lang.Boolean", "defaultValue": [...]
{ "name": "camel.rest.apiComponent", "description": "Sets the name of the
Camel component to use as the REST API (such as swagger or openapi)",
"sourceType": "org.apache.camel.spi.RestConfiguration", "type": "string",
"javaType": "java.lang.String" },
{ "name": "camel.rest.apiContextPath", "description": "Sets a leading API
context-path the REST API services will be using. This can be used when using
components such as camel-servlet where the deployed web application is deployed
using a context-path.", "sourceType": "org.apache.camel.spi.RestConfiguration",
"type": "string", "javaType": "java.lang.String" },
- { "name": "camel.rest.apiContextRouteId", "description": "Sets the route
id to use for the route that services the REST API. The route will by default
use an auto assigned route id.", "sourceType":
"org.apache.camel.spi.RestConfiguration", "type": "string", "javaType":
"java.lang.String" },
{ "name": "camel.rest.apiHost", "description": "To use a specific hostname
for the API documentation (such as swagger or openapi) This can be used to
override the generated host with this configured hostname", "sourceType":
"org.apache.camel.spi.RestConfiguration", "type": "string", "javaType":
"java.lang.String" },
{ "name": "camel.rest.apiProperties", "description": "Sets additional
options on api level", "sourceType": "org.apache.camel.spi.RestConfiguration",
"type": "object", "javaType": "java.util.Map" },
{ "name": "camel.rest.apiVendorExtension", "description": "Whether vendor
extension is enabled in the Rest APIs. If enabled then Camel will include
additional information as vendor extension (eg keys starting with x-) such as
route ids, class names etc. Not all 3rd party API gateways and tools supports
vendor-extensions when importing your API docs.", "sourceType":
"org.apache.camel.spi.RestConfiguration", "type": "boolean", "javaType":
"boolean", "defaultValue": "false" },
diff --git a/core/camel-main/src/main/docs/main.adoc
b/core/camel-main/src/main/docs/main.adoc
index 6505a8b..bc2ca85 100644
--- a/core/camel-main/src/main/docs/main.adoc
+++ b/core/camel-main/src/main/docs/main.adoc
@@ -165,14 +165,13 @@ The camel.health supports 6 options, which are listed
below.
|===
=== Camel Rest-DSL configurations
-The camel.rest supports 26 options, which are listed below.
+The camel.rest supports 25 options, which are listed below.
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
| *camel.rest.apiComponent* | Sets the name of the Camel component to use as
the REST API (such as swagger or openapi) | | String
| *camel.rest.apiContextPath* | Sets a leading API context-path the REST API
services will be using. This can be used when using components such as
camel-servlet where the deployed web application is deployed using a
context-path. | | String
-| *camel.rest.apiContextRouteId* | Sets the route id to use for the route that
services the REST API. The route will by default use an auto assigned route id.
| | String
| *camel.rest.apiHost* | To use a specific hostname for the API documentation
(such as swagger or openapi) This can be used to override the generated host
with this configured hostname | | String
| *camel.rest.apiProperties* | Sets additional options on api level | | Map
| *camel.rest.apiVendorExtension* | Whether vendor extension is enabled in the
Rest APIs. If enabled then Camel will include additional information as vendor
extension (eg keys starting with x-) such as route ids, class names etc. Not
all 3rd party API gateways and tools supports vendor-extensions when importing
your API docs. | false | boolean
diff --git
a/core/camel-main/src/main/java/org/apache/camel/main/RestConfigurationProperties.java
b/core/camel-main/src/main/java/org/apache/camel/main/RestConfigurationProperties.java
index 8f24a5d..6b8af6b 100644
---
a/core/camel-main/src/main/java/org/apache/camel/main/RestConfigurationProperties.java
+++
b/core/camel-main/src/main/java/org/apache/camel/main/RestConfigurationProperties.java
@@ -172,16 +172,6 @@ public class RestConfigurationProperties extends
RestConfiguration implements Bo
}
/**
- * Sets the route id to use for the route that services the REST API.
- * <p/>
- * The route will by default use an auto assigned route id.
- */
- public RestConfigurationProperties withApiContextRouteId(String
apiContextRouteId) {
- setApiContextRouteId(apiContextRouteId);
- return this;
- }
-
- /**
* Whether vendor extension is enabled in the Rest APIs. If enabled then
Camel will include additional information
* as vendor extension (eg keys starting with x-) such as route ids, class
names etc. Not all 3rd party API gateways
* and tools supports vendor-extensions when importing your API docs.
diff --git
a/core/camel-xml-io/src/generated/java/org/apache/camel/xml/in/ModelParser.java
b/core/camel-xml-io/src/generated/java/org/apache/camel/xml/in/ModelParser.java
index 54b116f..56d3407 100644
---
a/core/camel-xml-io/src/generated/java/org/apache/camel/xml/in/ModelParser.java
+++
b/core/camel-xml-io/src/generated/java/org/apache/camel/xml/in/ModelParser.java
@@ -3003,7 +3003,6 @@ public class ModelParser extends BaseParser {
switch (key) {
case "apiComponent": def.setApiComponent(val); break;
case "apiContextPath": def.setApiContextPath(val); break;
- case "apiContextRouteId": def.setApiContextRouteId(val); break;
case "apiHost": def.setApiHost(val); break;
case "apiVendorExtension":
def.setApiVendorExtension(Boolean.valueOf(val)); break;
case "bindingMode":
def.setBindingMode(RestBindingMode.valueOf(val)); break;
diff --git
a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java
b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java
index 2e7fe03..0f092a9 100644
---
a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java
+++
b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java
@@ -11930,7 +11930,6 @@ public final class ModelDeserializers extends
YamlDeserializerSupport {
properties = {
@YamlProperty(name = "api-component", type = "string"),
@YamlProperty(name = "api-context-path", type = "string"),
- @YamlProperty(name = "api-context-route-id", type =
"string", deprecated = true),
@YamlProperty(name = "api-host", type = "string"),
@YamlProperty(name = "api-property", type =
"array:org.apache.camel.model.rest.RestPropertyDefinition"),
@YamlProperty(name = "api-vendor-extension", type =
"boolean"),
@@ -11980,11 +11979,6 @@ public final class ModelDeserializers extends
YamlDeserializerSupport {
target.setApiContextPath(val);
break;
}
- case "api-context-route-id": {
- String val = asText(node);
- target.setApiContextRouteId(val);
- break;
- }
case "api-host": {
String val = asText(node);
target.setApiHost(val);
diff --git
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camel-yaml-dsl.json
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camel-yaml-dsl.json
index 754f3d4..84fc726 100644
---
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camel-yaml-dsl.json
+++
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camel-yaml-dsl.json
@@ -7183,9 +7183,6 @@
"api-context-path" : {
"type" : "string"
},
- "api-context-route-id" : {
- "type" : "string"
- },
"api-host" : {
"type" : "string"
},
diff --git
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camelYamlDsl.json
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camelYamlDsl.json
index 105dced..417f99a 100644
---
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camelYamlDsl.json
+++
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camelYamlDsl.json
@@ -7081,9 +7081,6 @@
"apiContextPath" : {
"type" : "string"
},
- "apiContextRouteId" : {
- "type" : "string"
- },
"apiHost" : {
"type" : "string"
},
