This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch xmlio in repository https://gitbox.apache.org/repos/asf/camel.git
commit fd9fdd5bdf0dfadc145009a0861019d0e0ebf74e Author: Claus Ibsen <[email protected]> AuthorDate: Thu May 15 08:35:59 2025 +0200 CAMEL-22064: camel-xml-io - Generate XSD schema --- .../org/apache/camel/catalog/models/securityDefinitions.json | 2 +- .../resources/org/apache/camel/catalog/schemas/camel-spring.xsd | 9 ++++++++- .../org/apache/camel/model/rest/securityDefinitions.json | 2 +- .../org/apache/camel/model/rest/RestSecuritiesDefinition.java | 2 +- .../src/generated/java/org/apache/camel/xml/in/ModelParser.java | 2 +- .../src/generated/java/org/apache/camel/xml/out/ModelWriter.java | 2 +- .../generated/java/org/apache/camel/yaml/out/ModelWriter.java | 2 +- .../modules/ROOT/pages/camel-4x-upgrade-guide-4_12.adoc | 3 +++ .../apache/camel/dsl/yaml/deserializers/ModelDeserializers.java | 4 ++-- .../src/generated/resources/schema/camelYamlDsl.json | 2 +- 10 files changed, 20 insertions(+), 10 deletions(-) diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/securityDefinitions.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/securityDefinitions.json index 2ca385a3df4..65d7a067c2b 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/securityDefinitions.json +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/securityDefinitions.json @@ -12,6 +12,6 @@ "output": false }, "properties": { - "securityDefinitions": { "index": 0, "kind": "element", "displayName": "Security Definitions", "group": "common", "required": true, "type": "array", "javaType": "java.util.List<org.apache.camel.model.rest.RestSecurityDefinition>", "oneOf": [ "apiKey", "basicAuth", "bearer", "mutualTLS", "oauth2", "openIdConnect" ], "deprecated": false, "autowired": false, "secret": false, "description": "Security definitions" } + "securityDefinitions": { "index": 0, "kind": "element", "displayName": "Security Definitions", "group": "common", "required": true, "type": "array", "javaType": "java.util.List<org.apache.camel.model.rest.RestSecurityDefinition>", "oneOf": [ "apiKey", "basicAuth", "bearerToken", "mutualTLS", "oauth2", "openIdConnect" ], "deprecated": false, "autowired": false, "secret": false, "description": "Security definitions" } } } 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 dd18084af9d..d556f843fdf 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 @@ -14905,6 +14905,13 @@ List of bean. </xs:element> <xs:any maxOccurs="unbounded" minOccurs="0" namespace="##other" processContents="skip"/> <xs:element minOccurs="0" name="dataFormats"> + <xs:annotation> + <xs:documentation xml:lang="en"> +<![CDATA[ +List of data formats. +]]> + </xs:documentation> + </xs:annotation> <xs:complexType> <xs:sequence> <xs:element maxOccurs="unbounded" minOccurs="0" name="dataFormat" type="tns:dataFormat"> @@ -15467,7 +15474,7 @@ patterns can be specified separated by comma. Default value: classpath:camel-moc <xs:choice maxOccurs="unbounded" minOccurs="0"> <xs:element ref="tns:apiKey"/> <xs:element ref="tns:basicAuth"/> - <xs:element name="bearer" type="tns:bearerTokenDefinition"/> + <xs:element ref="tns:bearerToken"/> <xs:element ref="tns:oauth2"/> <xs:element ref="tns:openIdConnect"/> <xs:element ref="tns:mutualTLS"/> diff --git a/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/rest/securityDefinitions.json b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/rest/securityDefinitions.json index 2ca385a3df4..65d7a067c2b 100644 --- a/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/rest/securityDefinitions.json +++ b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/rest/securityDefinitions.json @@ -12,6 +12,6 @@ "output": false }, "properties": { - "securityDefinitions": { "index": 0, "kind": "element", "displayName": "Security Definitions", "group": "common", "required": true, "type": "array", "javaType": "java.util.List<org.apache.camel.model.rest.RestSecurityDefinition>", "oneOf": [ "apiKey", "basicAuth", "bearer", "mutualTLS", "oauth2", "openIdConnect" ], "deprecated": false, "autowired": false, "secret": false, "description": "Security definitions" } + "securityDefinitions": { "index": 0, "kind": "element", "displayName": "Security Definitions", "group": "common", "required": true, "type": "array", "javaType": "java.util.List<org.apache.camel.model.rest.RestSecurityDefinition>", "oneOf": [ "apiKey", "basicAuth", "bearerToken", "mutualTLS", "oauth2", "openIdConnect" ], "deprecated": false, "autowired": false, "secret": false, "description": "Security definitions" } } } diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/rest/RestSecuritiesDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/rest/RestSecuritiesDefinition.java index 2e85b201c59..fa7c8291410 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/rest/RestSecuritiesDefinition.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/rest/RestSecuritiesDefinition.java @@ -42,7 +42,7 @@ public class RestSecuritiesDefinition { @XmlElements({ @XmlElement(name = "apiKey", type = ApiKeyDefinition.class), @XmlElement(name = "basicAuth", type = BasicAuthDefinition.class), - @XmlElement(name = "bearer", type = BearerTokenDefinition.class), + @XmlElement(name = "bearerToken", type = BearerTokenDefinition.class), @XmlElement(name = "oauth2", type = OAuth2Definition.class), @XmlElement(name = "openIdConnect", type = OpenIdConnectDefinition.class), @XmlElement(name = "mutualTLS", type = MutualTLSDefinition.class) }) 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 636325e0995..d2b12d1c686 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 @@ -2704,7 +2704,7 @@ public class ModelParser extends BaseParser { return doParse(new RestSecuritiesDefinition(), noAttributeHandler(), (def, key) -> switch (key) { case "apiKey": doAdd(doParseApiKeyDefinition(), def.getSecurityDefinitions(), def::setSecurityDefinitions); yield true; case "basicAuth": doAdd(doParseBasicAuthDefinition(), def.getSecurityDefinitions(), def::setSecurityDefinitions); yield true; - case "bearer": doAdd(doParseBearerTokenDefinition(), def.getSecurityDefinitions(), def::setSecurityDefinitions); yield true; + case "bearerToken": doAdd(doParseBearerTokenDefinition(), def.getSecurityDefinitions(), def::setSecurityDefinitions); yield true; case "oauth2": doAdd(doParseOAuth2Definition(), def.getSecurityDefinitions(), def::setSecurityDefinitions); yield true; case "openIdConnect": doAdd(doParseOpenIdConnectDefinition(), def.getSecurityDefinitions(), def::setSecurityDefinitions); yield true; case "mutualTLS": doAdd(doParseMutualTLSDefinition(), def.getSecurityDefinitions(), def::setSecurityDefinitions); yield true; diff --git a/core/camel-xml-io/src/generated/java/org/apache/camel/xml/out/ModelWriter.java b/core/camel-xml-io/src/generated/java/org/apache/camel/xml/out/ModelWriter.java index 108707bc038..98936e8807d 100644 --- a/core/camel-xml-io/src/generated/java/org/apache/camel/xml/out/ModelWriter.java +++ b/core/camel-xml-io/src/generated/java/org/apache/camel/xml/out/ModelWriter.java @@ -3520,7 +3520,7 @@ public class ModelWriter extends BaseWriter { switch (v.getClass().getSimpleName()) { case "ApiKeyDefinition" -> doWriteApiKeyDefinition("apiKey", (ApiKeyDefinition) v); case "BasicAuthDefinition" -> doWriteBasicAuthDefinition("basicAuth", (BasicAuthDefinition) v); - case "BearerTokenDefinition" -> doWriteBearerTokenDefinition("bearer", (BearerTokenDefinition) v); + case "BearerTokenDefinition" -> doWriteBearerTokenDefinition("bearerToken", (BearerTokenDefinition) v); case "OAuth2Definition" -> doWriteOAuth2Definition("oauth2", (OAuth2Definition) v); case "OpenIdConnectDefinition" -> doWriteOpenIdConnectDefinition("openIdConnect", (OpenIdConnectDefinition) v); case "MutualTLSDefinition" -> doWriteMutualTLSDefinition("mutualTLS", (MutualTLSDefinition) v); diff --git a/core/camel-yaml-io/src/generated/java/org/apache/camel/yaml/out/ModelWriter.java b/core/camel-yaml-io/src/generated/java/org/apache/camel/yaml/out/ModelWriter.java index 06757457799..1300b73b2ce 100644 --- a/core/camel-yaml-io/src/generated/java/org/apache/camel/yaml/out/ModelWriter.java +++ b/core/camel-yaml-io/src/generated/java/org/apache/camel/yaml/out/ModelWriter.java @@ -3520,7 +3520,7 @@ public class ModelWriter extends BaseWriter { switch (v.getClass().getSimpleName()) { case "ApiKeyDefinition" -> doWriteApiKeyDefinition("apiKey", (ApiKeyDefinition) v); case "BasicAuthDefinition" -> doWriteBasicAuthDefinition("basicAuth", (BasicAuthDefinition) v); - case "BearerTokenDefinition" -> doWriteBearerTokenDefinition("bearer", (BearerTokenDefinition) v); + case "BearerTokenDefinition" -> doWriteBearerTokenDefinition("bearerToken", (BearerTokenDefinition) v); case "OAuth2Definition" -> doWriteOAuth2Definition("oauth2", (OAuth2Definition) v); case "OpenIdConnectDefinition" -> doWriteOpenIdConnectDefinition("openIdConnect", (OpenIdConnectDefinition) v); case "MutualTLSDefinition" -> doWriteMutualTLSDefinition("mutualTLS", (MutualTLSDefinition) v); diff --git a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_12.adoc b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_12.adoc index 20d32cef2ed..3e2ff88efb1 100644 --- a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_12.adoc +++ b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_12.adoc @@ -119,6 +119,9 @@ For example Then Camel will now use `/cheese` as the base-path for the Rest DSL API endpoints from the `petstore-v3.json` openapi specification file. +When using code-first with Rest DSL and are specifying security constraints, then `bearer` in YAML and XML DSL has been renamed to `bearerToken` +to be aligned with Java DSL. + === camel-as2 Add options allowing the addition of an `Authorization` header for Basic or Bearer authentication to client and 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 bcafba6f5a8..413641d18b7 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 @@ -14927,7 +14927,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport { properties = { @YamlProperty(name = "apiKey", type = "object:org.apache.camel.model.rest.ApiKeyDefinition"), @YamlProperty(name = "basicAuth", type = "object:org.apache.camel.model.rest.BasicAuthDefinition"), - @YamlProperty(name = "bearer", type = "object:org.apache.camel.model.rest.BearerTokenDefinition"), + @YamlProperty(name = "bearerToken", type = "object:org.apache.camel.model.rest.BearerTokenDefinition"), @YamlProperty(name = "mutualTLS", type = "object:org.apache.camel.model.rest.MutualTLSDefinition"), @YamlProperty(name = "oauth2", type = "object:org.apache.camel.model.rest.OAuth2Definition"), @YamlProperty(name = "openIdConnect", type = "object:org.apache.camel.model.rest.OpenIdConnectDefinition") @@ -14973,7 +14973,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport { target.setSecurityDefinitions(existing); break; } - case "bearer": { + case "bearerToken": { org.apache.camel.model.rest.BearerTokenDefinition val = asType(node, org.apache.camel.model.rest.BearerTokenDefinition.class); java.util.List<org.apache.camel.model.rest.RestSecurityDefinition> existing = target.getSecurityDefinitions(); if (existing == null) { diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camelYamlDsl.json b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camelYamlDsl.json index a6e616c5786..0b7d93de324 100644 --- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camelYamlDsl.json +++ b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camelYamlDsl.json @@ -15989,7 +15989,7 @@ "basicAuth" : { "$ref" : "#/items/definitions/org.apache.camel.model.rest.BasicAuthDefinition" }, - "bearer" : { + "bearerToken" : { "$ref" : "#/items/definitions/org.apache.camel.model.rest.BearerTokenDefinition" }, "mutualTLS" : {
