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 74d21df CAMEL-17308: Remove verb as an allowed CAMEL REST YAML element. 74d21df is described below commit 74d21df584bda182df3c66a84ae6c146fac56a99 Author: Claus Ibsen <claus.ib...@gmail.com> AuthorDate: Fri Feb 18 09:21:28 2022 +0100 CAMEL-17308: Remove verb as an allowed CAMEL REST YAML element. --- .../org/apache/camel/catalog/models.properties | 4 --- .../org/apache/camel/catalog/models/parameter.json | 18 ------------ .../apache/camel/catalog/models/sagaOption.json | 20 -------------- .../camel/catalog/models/templateScript.json | 17 ------------ .../org/apache/camel/catalog/models/verb.json | 32 ---------------------- .../apache/camel/catalog/schemas/camel-spring.xsd | 2 +- components/camel-spring-xml/pom.xml | 8 +----- .../camel/spring/CamelContextFactoryBeanTest.java | 27 ------------------ .../services/org/apache/camel/model.properties | 4 --- .../org/apache/camel/model/parameter.json | 18 ------------ .../org/apache/camel/model/rest/verb.json | 32 ---------------------- .../org/apache/camel/model/sagaOption.json | 20 -------------- .../org/apache/camel/model/templateScript.json | 17 ------------ .../apache/camel/model/rest/VerbDefinition.java | 2 +- 14 files changed, 3 insertions(+), 218 deletions(-) diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models.properties b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models.properties index 51f1f6e..79538ac 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models.properties +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models.properties @@ -110,7 +110,6 @@ otherwise outputType packageScan param -parameter passThroughServiceFilter patch pgp @@ -162,7 +161,6 @@ routes routingSlip rss saga -sagaOption sample script secureRandomParameters @@ -195,7 +193,6 @@ tarFile template templateBean templateParameter -templateScript templatedRoute templatedRouteBean templatedRouteParameter @@ -222,7 +219,6 @@ univocityTsv unmarshal validate validators -verb weighted when whenSkipSendToEndpoint diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/parameter.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/parameter.json deleted file mode 100644 index dce92ce..0000000 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/parameter.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "parameter", - "title": "Parameter", - "description": "An input parameter of a route template.", - "deprecated": false, - "label": "configuration", - "javaType": "org.apache.camel.model.TemplatedRouteParameterDefinition", - "abstract": false, - "input": false, - "output": false - }, - "properties": { - "name": { "kind": "attribute", "displayName": "Name", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The name of the parameter" }, - "value": { "kind": "attribute", "displayName": "Value", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The value of the parameter." } - } -} diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/sagaOption.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/sagaOption.json deleted file mode 100644 index 1396147..0000000 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/sagaOption.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "sagaOption", - "title": "Saga Option", - "description": "Allows declaring options on Sagas", - "deprecated": true, - "label": "configuration", - "javaType": "org.apache.camel.model.SagaOptionDefinition", - "abstract": false, - "input": true, - "output": false - }, - "properties": { - "expression": { "kind": "expression", "displayName": "Expression", "required": true, "type": "object", "javaType": "org.apache.camel.model.language.ExpressionDefinition", "oneOf": [ "constant", "csimple", "datasonnet", "exchangeProperty", "groovy", "header", "hl7terser", "joor", "jsonpath", "language", "method", "mvel", "ognl", "ref", "simple", "spel", "tokenize", "xpath", "xquery", "xtokenize" ], "deprecated": false, "autowired": false, "secret": false }, - "name": { "kind": "attribute", "displayName": "Name", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Name of the option. It identifies the name of the header where the value of the expression will be stored when the compensation or completion routes will be called." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the id of this node" }, - "description": { "kind": "element", "displayName": "Description", "required": false, "type": "object", "javaType": "org.apache.camel.model.DescriptionDefinition", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the description of this node" } - } -} diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/templateScript.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/templateScript.json deleted file mode 100644 index 8cb4a75..0000000 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/templateScript.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "templateScript", - "title": "Template Script", - "description": "A route template script (local bean) when using scripting languages such as groovy", - "deprecated": false, - "label": "configuration", - "javaType": "org.apache.camel.model.RouteTemplateScriptDefinition", - "abstract": false, - "input": false, - "output": false - }, - "properties": { - "script": { "kind": "value", "displayName": "Script", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The script to execute that creates the bean when using scripting languages. If the script use the prefix resource: such as resource:classpath:com\/foo\/myscript.groovy, resource:file:\/var\/myscript.groovy, then its loaded from the external resource." } - } -} diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/verb.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/verb.json deleted file mode 100644 index 0f31055..0000000 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/verb.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "verb", - "title": "Verb", - "description": "Rest command", - "deprecated": false, - "label": "rest", - "javaType": "org.apache.camel.model.rest.VerbDefinition", - "abstract": false, - "input": true, - "output": false - }, - "properties": { - "method": { "kind": "attribute", "displayName": "Method", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The HTTP verb such as GET, POST, DELETE, etc." }, - "uri": { "kind": "attribute", "displayName": "Uri", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Uri template of this REST service such as \/{id}." }, - "consumes": { "kind": "attribute", "displayName": "Consumes", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "To define the content type what the REST service consumes (accept as input), such as application\/xml or application\/json. This option will override what may be configured on a parent level" }, - "produces": { "kind": "attribute", "displayName": "Produces", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "To define the content type what the REST service produces (uses for output), such as application\/xml or application\/json This option will override what may be configured on a parent level" }, - "bindingMode": { "kind": "attribute", "displayName": "Binding Mode", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "auto", "description": "Sets the binding mode to use. This option will override what may be configured on a parent level The default value is auto" }, - "skipBindingOnErrorCode": { "kind": "attribute", "displayName": "Skip Binding On Error Code", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Whether to skip binding on output if there is a custom HTTP error code header. This allows to build custom error messages that do not bind to json \/ xml etc, as success messages otherwise will do. This option will override what may be configured on a [...] - "clientRequestValidation": { "kind": "attribute", "displayName": "Client Request Validation", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Whether to enable validation of the client request to check: 1) Content-Type header matches what the Rest DSL consumes; returns HTTP Status 415 if validation error. 2) Accept header matches what the Rest DSL produces; returns HTTP Status 406 if valida [...] - "enableCORS": { "kind": "attribute", "displayName": "Enable CORS", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Whether to enable CORS headers in the HTTP response. This option will override what may be configured on a parent level The default value is false." }, - "routeId": { "kind": "attribute", "displayName": "Route Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The route id this rest-dsl is using (read-only)" }, - "apiDocs": { "kind": "attribute", "displayName": "Api Docs", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Whether to include or exclude the VerbDefinition in API documentation. The default value is true." }, - "deprecated": { "kind": "attribute", "displayName": "Deprecated", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Sets deprecated flag in openapi" }, - "type": { "kind": "attribute", "displayName": "Type", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the class name to use for binding from input to POJO for the incoming data This option will override what may be configured on a parent level. The name of the class of the input data. Append a to the end of the name if you want the input to be an array type." }, - "outType": { "kind": "attribute", "displayName": "Out Type", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the class name to use for binding from POJO to output for the outgoing data This option will override what may be configured on a parent level The name of the class of the input data. Append a to the end of the name if you want the input to be an array type." }, - "toOrRoute": { "kind": "element", "displayName": "To Or Route", "required": true, "type": "object", "javaType": "org.apache.camel.model.OptionalIdentifiedDefinition<java.lang.Object>", "oneOf": [ "route", "to", "toD" ], "deprecated": false, "autowired": false, "secret": false, "description": "To route from this REST service to a Camel endpoint, or an inlined route" }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the id of this node" }, - "description": { "kind": "element", "displayName": "Description", "required": false, "type": "object", "javaType": "org.apache.camel.model.DescriptionDefinition", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the description of this node" } - } -} 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 798d27f..e11a5b6 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 @@ -13837,7 +13837,7 @@ configuration, so these custom functions can be used in xquery expressions. </xs:complexContent> </xs:complexType> - <xs:complexType name="verbDefinition"> + <xs:complexType abstract="true" name="verbDefinition"> <xs:complexContent> <xs:extension base="tns:optionalIdentifiedDefinition"> <xs:sequence> diff --git a/components/camel-spring-xml/pom.xml b/components/camel-spring-xml/pom.xml index 0393db3..01bfa2c 100644 --- a/components/camel-spring-xml/pom.xml +++ b/components/camel-spring-xml/pom.xml @@ -150,13 +150,7 @@ <scope>test</scope> </dependency> - <!-- xmlunit, assertj and woostox are used for a few tests --> - <dependency> - <groupId>org.xmlunit</groupId> - <artifactId>xmlunit-core</artifactId> - <version>${xmlunit-version}</version> - <scope>test</scope> - </dependency> + <!-- assertj and woostox are used for a few tests --> <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> diff --git a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/CamelContextFactoryBeanTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/CamelContextFactoryBeanTest.java index 53c425f..8ad805a 100644 --- a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/CamelContextFactoryBeanTest.java +++ b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/CamelContextFactoryBeanTest.java @@ -16,25 +16,16 @@ */ package org.apache.camel.spring; -import java.net.URL; -import java.util.LinkedList; -import java.util.List; - import org.apache.camel.spi.ModelJAXBContextFactory; import org.apache.camel.spi.UuidGenerator; import org.apache.camel.spring.xml.CamelContextFactoryBean; -import org.apache.camel.spring.xml.CamelEndpointFactoryBean; import org.apache.camel.support.DefaultUuidGenerator; import org.apache.camel.support.SimpleUuidGenerator; import org.apache.camel.xml.jaxb.DefaultModelJAXBContextFactory; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.context.support.StaticApplicationContext; -import org.xmlunit.builder.DiffBuilder; -import org.xmlunit.builder.Input; -import org.xmlunit.diff.Diff; -import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; public class CamelContextFactoryBeanTest { @@ -70,24 +61,6 @@ public class CamelContextFactoryBeanTest { } @Test - public void testSetEndpoints() throws Exception { - // Create a new Camel context and add an endpoint - CamelContextFactoryBean camelContext = new CamelContextFactoryBean(); - List<CamelEndpointFactoryBean> endpoints = new LinkedList<>(); - CamelEndpointFactoryBean endpoint = new CamelEndpointFactoryBean(); - endpoint.setId("endpoint1"); - endpoint.setUri("mock:end"); - endpoints.add(endpoint); - camelContext.setEndpoints(endpoints); - - // Compare the new context with our reference context - URL expectedContext = getClass().getResource("/org/apache/camel/spring/context-with-endpoint.xml"); - Diff diff = DiffBuilder.compare(expectedContext).withTest(Input.fromJaxb(camelContext)) - .ignoreWhitespace().ignoreComments().checkForSimilar().build(); - assertFalse(diff.hasDifferences(), "Expected context and actual context differ:\n" + diff.toString()); - } - - @Test public void testCustomModelJAXBContextFactory() throws Exception { StaticApplicationContext applicationContext = new StaticApplicationContext(); applicationContext.registerSingleton("customModelJAXBContextFactory", CustomModelJAXBContextFactory.class); diff --git a/core/camel-core-model/src/generated/resources/META-INF/services/org/apache/camel/model.properties b/core/camel-core-model/src/generated/resources/META-INF/services/org/apache/camel/model.properties index 5571914..cdf082b 100644 --- a/core/camel-core-model/src/generated/resources/META-INF/services/org/apache/camel/model.properties +++ b/core/camel-core-model/src/generated/resources/META-INF/services/org/apache/camel/model.properties @@ -104,7 +104,6 @@ otherwise outputType packageScan param -parameter passThroughServiceFilter patch pgp @@ -151,7 +150,6 @@ routes routingSlip rss saga -sagaOption sample script security @@ -181,7 +179,6 @@ syslog tarFile templateBean templateParameter -templateScript templatedRoute templatedRouteBean templatedRouteParameter @@ -207,7 +204,6 @@ univocityTsv unmarshal validate validators -verb weighted when whenSkipSendToEndpoint diff --git a/core/camel-core-model/src/generated/resources/org/apache/camel/model/parameter.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/parameter.json deleted file mode 100644 index dce92ce..0000000 --- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/parameter.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "parameter", - "title": "Parameter", - "description": "An input parameter of a route template.", - "deprecated": false, - "label": "configuration", - "javaType": "org.apache.camel.model.TemplatedRouteParameterDefinition", - "abstract": false, - "input": false, - "output": false - }, - "properties": { - "name": { "kind": "attribute", "displayName": "Name", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The name of the parameter" }, - "value": { "kind": "attribute", "displayName": "Value", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The value of the parameter." } - } -} diff --git a/core/camel-core-model/src/generated/resources/org/apache/camel/model/rest/verb.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/rest/verb.json deleted file mode 100644 index 0f31055..0000000 --- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/rest/verb.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "verb", - "title": "Verb", - "description": "Rest command", - "deprecated": false, - "label": "rest", - "javaType": "org.apache.camel.model.rest.VerbDefinition", - "abstract": false, - "input": true, - "output": false - }, - "properties": { - "method": { "kind": "attribute", "displayName": "Method", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The HTTP verb such as GET, POST, DELETE, etc." }, - "uri": { "kind": "attribute", "displayName": "Uri", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Uri template of this REST service such as \/{id}." }, - "consumes": { "kind": "attribute", "displayName": "Consumes", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "To define the content type what the REST service consumes (accept as input), such as application\/xml or application\/json. This option will override what may be configured on a parent level" }, - "produces": { "kind": "attribute", "displayName": "Produces", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "To define the content type what the REST service produces (uses for output), such as application\/xml or application\/json This option will override what may be configured on a parent level" }, - "bindingMode": { "kind": "attribute", "displayName": "Binding Mode", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "auto", "description": "Sets the binding mode to use. This option will override what may be configured on a parent level The default value is auto" }, - "skipBindingOnErrorCode": { "kind": "attribute", "displayName": "Skip Binding On Error Code", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Whether to skip binding on output if there is a custom HTTP error code header. This allows to build custom error messages that do not bind to json \/ xml etc, as success messages otherwise will do. This option will override what may be configured on a [...] - "clientRequestValidation": { "kind": "attribute", "displayName": "Client Request Validation", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Whether to enable validation of the client request to check: 1) Content-Type header matches what the Rest DSL consumes; returns HTTP Status 415 if validation error. 2) Accept header matches what the Rest DSL produces; returns HTTP Status 406 if valida [...] - "enableCORS": { "kind": "attribute", "displayName": "Enable CORS", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Whether to enable CORS headers in the HTTP response. This option will override what may be configured on a parent level The default value is false." }, - "routeId": { "kind": "attribute", "displayName": "Route Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The route id this rest-dsl is using (read-only)" }, - "apiDocs": { "kind": "attribute", "displayName": "Api Docs", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Whether to include or exclude the VerbDefinition in API documentation. The default value is true." }, - "deprecated": { "kind": "attribute", "displayName": "Deprecated", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Sets deprecated flag in openapi" }, - "type": { "kind": "attribute", "displayName": "Type", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the class name to use for binding from input to POJO for the incoming data This option will override what may be configured on a parent level. The name of the class of the input data. Append a to the end of the name if you want the input to be an array type." }, - "outType": { "kind": "attribute", "displayName": "Out Type", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the class name to use for binding from POJO to output for the outgoing data This option will override what may be configured on a parent level The name of the class of the input data. Append a to the end of the name if you want the input to be an array type." }, - "toOrRoute": { "kind": "element", "displayName": "To Or Route", "required": true, "type": "object", "javaType": "org.apache.camel.model.OptionalIdentifiedDefinition<java.lang.Object>", "oneOf": [ "route", "to", "toD" ], "deprecated": false, "autowired": false, "secret": false, "description": "To route from this REST service to a Camel endpoint, or an inlined route" }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the id of this node" }, - "description": { "kind": "element", "displayName": "Description", "required": false, "type": "object", "javaType": "org.apache.camel.model.DescriptionDefinition", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the description of this node" } - } -} diff --git a/core/camel-core-model/src/generated/resources/org/apache/camel/model/sagaOption.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/sagaOption.json deleted file mode 100644 index 1396147..0000000 --- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/sagaOption.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "sagaOption", - "title": "Saga Option", - "description": "Allows declaring options on Sagas", - "deprecated": true, - "label": "configuration", - "javaType": "org.apache.camel.model.SagaOptionDefinition", - "abstract": false, - "input": true, - "output": false - }, - "properties": { - "expression": { "kind": "expression", "displayName": "Expression", "required": true, "type": "object", "javaType": "org.apache.camel.model.language.ExpressionDefinition", "oneOf": [ "constant", "csimple", "datasonnet", "exchangeProperty", "groovy", "header", "hl7terser", "joor", "jsonpath", "language", "method", "mvel", "ognl", "ref", "simple", "spel", "tokenize", "xpath", "xquery", "xtokenize" ], "deprecated": false, "autowired": false, "secret": false }, - "name": { "kind": "attribute", "displayName": "Name", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Name of the option. It identifies the name of the header where the value of the expression will be stored when the compensation or completion routes will be called." }, - "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the id of this node" }, - "description": { "kind": "element", "displayName": "Description", "required": false, "type": "object", "javaType": "org.apache.camel.model.DescriptionDefinition", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the description of this node" } - } -} diff --git a/core/camel-core-model/src/generated/resources/org/apache/camel/model/templateScript.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/templateScript.json deleted file mode 100644 index 8cb4a75..0000000 --- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/templateScript.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "model": { - "kind": "model", - "name": "templateScript", - "title": "Template Script", - "description": "A route template script (local bean) when using scripting languages such as groovy", - "deprecated": false, - "label": "configuration", - "javaType": "org.apache.camel.model.RouteTemplateScriptDefinition", - "abstract": false, - "input": false, - "output": false - }, - "properties": { - "script": { "kind": "value", "displayName": "Script", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The script to execute that creates the bean when using scripting languages. If the script use the prefix resource: such as resource:classpath:com\/foo\/myscript.groovy, resource:file:\/var\/myscript.groovy, then its loaded from the external resource." } - } -} diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/rest/VerbDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/rest/VerbDefinition.java index b239e2f0..8aa4fbd 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/rest/VerbDefinition.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/rest/VerbDefinition.java @@ -41,7 +41,7 @@ import org.apache.camel.spi.Metadata; */ @Metadata(label = "rest") @XmlAccessorType(XmlAccessType.FIELD) -public class VerbDefinition extends OptionalIdentifiedDefinition<VerbDefinition> implements Block, OutputNode { +public abstract class VerbDefinition extends OptionalIdentifiedDefinition<VerbDefinition> implements Block, OutputNode { @XmlElementRef private List<RestOperationParamDefinition> params = new ArrayList<>();