You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2022/12/30 18:05:22 UTC
[camel] branch main updated: Regen for commit e06690374992b807ebf5b9d4c2747df0988b26d8
This is an automated email from the ASF dual-hosted git repository.
acosentino 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 1f8700a7334 Regen for commit e06690374992b807ebf5b9d4c2747df0988b26d8
1f8700a7334 is described below
commit 1f8700a733442e36ed0191cf06574646d62f32b1
Author: davsclaus <da...@users.noreply.github.com>
AuthorDate: Fri Dec 30 17:56:26 2022 +0000
Regen for commit e06690374992b807ebf5b9d4c2747df0988b26d8
Signed-off-by: GitHub <no...@github.com>
---
.../apache/camel/catalog/dataformats/jsonApi.json | 4 +-
.../org/apache/camel/catalog/models.properties | 1 -
.../org/apache/camel/catalog/models/jsonApi.json | 4 +-
.../org/apache/camel/catalog/models/param.json | 2 +-
.../camel/catalog/models/responseHeader.json | 2 +-
.../apache/camel/catalog/schemas/camel-spring.xsd | 54 +++++++++++-----------
.../camel/component/jsonapi/JsonApiDataFormat.java | 3 +-
.../camel/model/dataformat/JsonApiDataFormat.java | 7 ++-
.../camel/component/rest/FromRestGetTest.java | 2 -
.../java/org/apache/camel/xml/in/BaseParser.java | 1 -
.../org/apache/camel/xml/in/ModelParserTest.java | 3 +-
.../camel/maven/packaging/SchemaGeneratorMojo.java | 1 -
12 files changed, 39 insertions(+), 45 deletions(-)
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/jsonApi.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/jsonApi.json
index 88be1d947d7..aab5b82aea8 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/jsonApi.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/jsonApi.json
@@ -16,8 +16,8 @@
"modelJavaType": "org.apache.camel.model.dataformat.JsonApiDataFormat"
},
"properties": {
- "dataFormatTypes": { "kind": "attribute", "displayName": "Data Format Types", "required": false, "type": "string", "javaType": "java.lang.Class<java.lang.Object>[]", "deprecated": false, "autowired": false, "secret": false, "description": "The classes to take into account for the marshalling" },
- "mainFormatType": { "kind": "attribute", "displayName": "Main Format Type", "required": false, "type": "string", "javaType": "java.lang.Class<java.lang.Object>", "deprecated": false, "autowired": false, "secret": false, "description": "The classes to take into account while unmarshalling" },
+ "dataFormatTypes": { "kind": "attribute", "displayName": "Data Format Types", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The classes to take into account for the marshalling. Multiple classes can be separated by comma." },
+ "mainFormatType": { "kind": "attribute", "displayName": "Main Format Type", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The class to take into account while unmarshalling." },
"id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The id of this node" }
}
}
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 1f8171a834c..183d96a99d2 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
@@ -1,5 +1,4 @@
aggregate
-allowedValue
any23
apiKey
asn1
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/jsonApi.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/jsonApi.json
index c654b024c42..781d1dba500 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/jsonApi.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/jsonApi.json
@@ -13,8 +13,8 @@
"output": false
},
"properties": {
- "dataFormatTypes": { "kind": "attribute", "displayName": "Data Format Types", "required": false, "type": "string", "javaType": "java.lang.Class<java.lang.Object>[]", "deprecated": false, "autowired": false, "secret": false, "description": "The classes to take into account for the marshalling" },
- "mainFormatType": { "kind": "attribute", "displayName": "Main Format Type", "required": false, "type": "string", "javaType": "java.lang.Class<java.lang.Object>", "deprecated": false, "autowired": false, "secret": false, "description": "The classes to take into account while unmarshalling" },
+ "dataFormatTypes": { "kind": "attribute", "displayName": "Data Format Types", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The classes to take into account for the marshalling. Multiple classes can be separated by comma." },
+ "mainFormatType": { "kind": "attribute", "displayName": "Main Format Type", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The class to take into account while unmarshalling." },
"id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The id of this node" }
}
}
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/param.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/param.json
index 72e0f850dc3..dfbf215e6c1 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/param.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/param.json
@@ -20,7 +20,7 @@
"arrayType": { "kind": "attribute", "displayName": "Array Type", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "string", "description": "Sets the parameter array type. Required if data type is array. Describes the type of items in the array." },
"dataType": { "kind": "attribute", "displayName": "Data Type", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "string", "description": "Sets the parameter data type." },
"dataFormat": { "kind": "attribute", "displayName": "Data Format", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the parameter data format." },
- "allowableValue": { "kind": "element", "displayName": "Allowable Value", "required": false, "type": "array", "javaType": "java.util.List<org.apache.camel.model.ValueDefinition>", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the parameter list of allowable values (enum)." },
+ "allowableValues": { "kind": "element", "displayName": "Allowable Values", "required": false, "type": "array", "javaType": "java.util.List<org.apache.camel.model.ValueDefinition>", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the parameter list of allowable values (enum)." },
"description": { "kind": "attribute", "displayName": "Description", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the parameter description." }
}
}
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/responseHeader.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/responseHeader.json
index 7f3ce3cfdb2..e4712c127a5 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/responseHeader.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/responseHeader.json
@@ -17,7 +17,7 @@
"arrayType": { "kind": "attribute", "displayName": "Array Type", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "string", "description": "Sets the parameter array type. Required if data type is array. Describes the type of items in the array." },
"dataType": { "kind": "attribute", "displayName": "Data Type", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "string", "description": "Sets the header data type." },
"dataFormat": { "kind": "attribute", "displayName": "Data Format", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the parameter data format." },
- "value": { "kind": "element", "displayName": "Value", "required": false, "type": "array", "javaType": "java.util.List<org.apache.camel.model.ValueDefinition>", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the parameter list of allowable values." },
+ "allowableValues": { "kind": "element", "displayName": "Allowable Values", "required": false, "type": "array", "javaType": "java.util.List<org.apache.camel.model.ValueDefinition>", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the parameter list of allowable values." },
"example": { "kind": "attribute", "displayName": "Example", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the example" },
"description": { "kind": "attribute", "displayName": "Description", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Description of the parameter." }
}
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 b3c62dfff77..a3d9b91b2ca 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
@@ -11549,28 +11549,22 @@ true
<xs:sequence/>
- <xs:attribute name="dataFormatTypes">
+ <xs:attribute name="dataFormatTypes" type="xs:string">
<xs:annotation>
<xs:documentation xml:lang="en">
<![CDATA[
-The classes to take into account for the marshalling.
+The classes to take into account for the marshalling. Multiple classes can be
+separated by comma.
]]>
</xs:documentation>
</xs:annotation>
-
- <xs:simpleType>
-
- <xs:list itemType="xs:string"/>
-
- </xs:simpleType>
-
</xs:attribute>
<xs:attribute name="mainFormatType" type="xs:string">
<xs:annotation>
<xs:documentation xml:lang="en">
<![CDATA[
-The classes to take into account while unmarshalling.
+The class to take into account while unmarshalling.
]]>
</xs:documentation>
</xs:annotation>
@@ -16001,6 +15995,8 @@ Reference to the routes in the xml dsl.
<xs:sequence>
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="routeProperty" type="tns:propertyDefinition"/>
+
<xs:element minOccurs="0" ref="tns:from"/>
<xs:element minOccurs="0" ref="tns:inputType"/>
@@ -16144,8 +16140,6 @@ Reference to the routes in the xml dsl.
<xs:element ref="tns:serviceCall"/>
</xs:choice>
-
- <xs:element maxOccurs="unbounded" minOccurs="0" name="routeProperty" type="tns:propertyDefinition"/>
</xs:sequence>
@@ -21398,20 +21392,19 @@ Sets the id of the route.
<xs:sequence>
<xs:element minOccurs="0" name="allowableValues">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+ <![CDATA[
+Sets the parameter list of allowable values (enum).
+ ]]>
+ </xs:documentation>
+ </xs:annotation>
<xs:complexType>
<xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="allowableValue" type="tns:valueDefinition">
- <xs:annotation>
- <xs:documentation xml:lang="en">
- <![CDATA[
-Sets the parameter list of allowable values (enum).
- ]]>
- </xs:documentation>
- </xs:annotation>
- </xs:element>
+ <xs:element maxOccurs="unbounded" minOccurs="0" ref="tns:value"/>
</xs:sequence>
@@ -21605,6 +21598,13 @@ The response model.
<xs:sequence>
<xs:element minOccurs="0" name="allowableValues">
+ <xs:annotation>
+ <xs:documentation xml:lang="en">
+ <![CDATA[
+Sets the parameter list of allowable values.
+ ]]>
+ </xs:documentation>
+ </xs:annotation>
<xs:complexType>
@@ -22177,7 +22177,7 @@ hostname.
</xs:annotation>
</xs:attribute>
- <xs:attribute name="useXForwardHeaders" type="xs:boolean">
+ <xs:attribute name="useXForwardHeaders" type="xs:string">
<xs:annotation>
<xs:documentation xml:lang="en">
<![CDATA[
@@ -22237,7 +22237,7 @@ will by default use an auto assigned route id.
</xs:annotation>
</xs:attribute>
- <xs:attribute name="apiVendorExtension" type="xs:boolean">
+ <xs:attribute name="apiVendorExtension" type="xs:string">
<xs:annotation>
<xs:documentation xml:lang="en">
<![CDATA[
@@ -22271,7 +22271,7 @@ Sets the binding mode to use. The default value is off. Default value: off
</xs:annotation>
</xs:attribute>
- <xs:attribute name="skipBindingOnErrorCode" type="xs:boolean">
+ <xs:attribute name="skipBindingOnErrorCode" type="xs:string">
<xs:annotation>
<xs:documentation xml:lang="en">
<![CDATA[
@@ -22283,7 +22283,7 @@ as success messages otherwise will do. Default value: false
</xs:annotation>
</xs:attribute>
- <xs:attribute name="clientRequestValidation" type="xs:boolean">
+ <xs:attribute name="clientRequestValidation" type="xs:string">
<xs:annotation>
<xs:documentation xml:lang="en">
<![CDATA[
@@ -22299,7 +22299,7 @@ Status 400 if validation error. Default value: false
</xs:annotation>
</xs:attribute>
- <xs:attribute name="enableCORS" type="xs:boolean">
+ <xs:attribute name="enableCORS" type="xs:string">
<xs:annotation>
<xs:documentation xml:lang="en">
<![CDATA[
@@ -22310,7 +22310,7 @@ Default value: false
</xs:annotation>
</xs:attribute>
- <xs:attribute name="inlineRoutes" type="xs:boolean">
+ <xs:attribute name="inlineRoutes" type="xs:string">
<xs:annotation>
<xs:documentation xml:lang="en">
<![CDATA[
diff --git a/components/camel-jsonapi/src/main/java/org/apache/camel/component/jsonapi/JsonApiDataFormat.java b/components/camel-jsonapi/src/main/java/org/apache/camel/component/jsonapi/JsonApiDataFormat.java
index 30aba088557..9231d129f98 100644
--- a/components/camel-jsonapi/src/main/java/org/apache/camel/component/jsonapi/JsonApiDataFormat.java
+++ b/components/camel-jsonapi/src/main/java/org/apache/camel/component/jsonapi/JsonApiDataFormat.java
@@ -90,8 +90,7 @@ public class JsonApiDataFormat extends ServiceSupport implements DataFormat, Dat
}
/**
- * The classes (FQN name) to take into account for the marshalling.
- * Multiple class names can be separated by comma.
+ * The classes (FQN name) to take into account for the marshalling. Multiple class names can be separated by comma.
*/
public void setDataFormatTypes(String dataFormatTypes) {
this.dataFormatTypes = dataFormatTypes;
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/JsonApiDataFormat.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/JsonApiDataFormat.java
index e5dc64c047f..caf2a5c91dc 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/JsonApiDataFormat.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/JsonApiDataFormat.java
@@ -61,8 +61,7 @@ public class JsonApiDataFormat extends DataFormatDefinition {
}
/**
- * The classes to take into account for the marshalling.
- * Multiple classes can be separated by comma.
+ * The classes to take into account for the marshalling. Multiple classes can be separated by comma.
*/
public void setDataFormatTypes(String dataFormatTypes) {
this.dataFormatTypes = dataFormatTypes;
@@ -121,8 +120,8 @@ public class JsonApiDataFormat extends DataFormatDefinition {
}
/**
- * The classes (FQN name) to take into account for the marshalling.
- * Multiple class names can be separated by comma.
+ * The classes (FQN name) to take into account for the marshalling. Multiple class names can be separated by
+ * comma.
*/
public Builder dataFormatTypes(String dataFormatTypes) {
this.dataFormatTypes = dataFormatTypes;
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/rest/FromRestGetTest.java b/core/camel-core/src/test/java/org/apache/camel/component/rest/FromRestGetTest.java
index c8db3b9e00f..a64da24731c 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/rest/FromRestGetTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/rest/FromRestGetTest.java
@@ -16,8 +16,6 @@
*/
package org.apache.camel.component.rest;
-import java.util.Arrays;
-
import org.apache.camel.ContextTestSupport;
import org.apache.camel.Route;
import org.apache.camel.builder.RouteBuilder;
diff --git a/core/camel-xml-io/src/main/java/org/apache/camel/xml/in/BaseParser.java b/core/camel-xml-io/src/main/java/org/apache/camel/xml/in/BaseParser.java
index d52dd0113bb..96f892e7a8f 100644
--- a/core/camel-xml-io/src/main/java/org/apache/camel/xml/in/BaseParser.java
+++ b/core/camel-xml-io/src/main/java/org/apache/camel/xml/in/BaseParser.java
@@ -19,7 +19,6 @@ package org.apache.camel.xml.in;
import java.io.IOException;
import java.io.InputStream;
import java.io.Reader;
-import java.lang.reflect.Array;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Base64;
diff --git a/core/camel-xml-io/src/test/java/org/apache/camel/xml/in/ModelParserTest.java b/core/camel-xml-io/src/test/java/org/apache/camel/xml/in/ModelParserTest.java
index 4a55199a102..a8b49a5d483 100644
--- a/core/camel-xml-io/src/test/java/org/apache/camel/xml/in/ModelParserTest.java
+++ b/core/camel-xml-io/src/test/java/org/apache/camel/xml/in/ModelParserTest.java
@@ -48,7 +48,8 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
public class ModelParserTest {
public static final String NAMESPACE = "http://camel.apache.org/schema/spring";
- private static final List<String> REST_XMLS = Arrays.asList("barRest.xml", "simpleRest.xml", "simpleRestToD.xml", "restAllowedValues.xml");
+ private static final List<String> REST_XMLS
+ = Arrays.asList("barRest.xml", "simpleRest.xml", "simpleRestToD.xml", "restAllowedValues.xml");
private static final List<String> TEMPLATE_XMLS = Arrays.asList("barTemplate.xml");
private static final List<String> TEMPLATED_ROUTE_XMLS = Arrays.asList("barTemplatedRoute.xml");
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SchemaGeneratorMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SchemaGeneratorMojo.java
index 6adab4c05de..de08a53f18d 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SchemaGeneratorMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SchemaGeneratorMojo.java
@@ -18,7 +18,6 @@ package org.apache.camel.maven.packaging;
import java.io.File;
import java.io.IOException;
-import java.lang.reflect.AccessibleObject;
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
import java.lang.reflect.Type;