You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2022/12/30 19:57:23 UTC
[camel] 01/02: Regen for commit e06690374992b807ebf5b9d4c2747df0988b26d8
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.20.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 863e2291e40eaecf516a59c1acdb6bd2468af594
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/jsonApi.json | 4 ++--
.../apache/camel/catalog/schemas/camel-spring.xsd | 26 +++++++++-------------
.../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 -
9 files changed, 20 insertions(+), 31 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 2f90a61c902..5d041aa89f7 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/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/schemas/camel-spring.xsd b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
index 8a0b6eaf7ca..29f71800aea 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
@@ -11534,28 +11534,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>
@@ -22168,7 +22162,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[
@@ -22228,7 +22222,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[
@@ -22262,7 +22256,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[
@@ -22274,7 +22268,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[
@@ -22290,7 +22284,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[
@@ -22301,7 +22295,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 6be9dd24496..85d2a2e37c0 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;