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-spring-boot.git
The following commit(s) were added to refs/heads/main by this push:
new 57a2bfc974c CAMEL-18320: camel-core - Move xtokenize language into
camel-stax
57a2bfc974c is described below
commit 57a2bfc974c91e772da5fbc346bc9c9f7409b843
Author: Claus Ibsen <[email protected]>
AuthorDate: Mon Sep 5 14:54:17 2022 +0200
CAMEL-18320: camel-core - Move xtokenize language into camel-stax
---
.../springboot/catalog/components/language.json | 2 +-
.../springboot/catalog/languages/xtokenize.json | 2 +-
.../camel/springboot/catalog/others.properties | 1 +
.../camel/springboot/catalog/others/xml-jaxp.json | 15 +++++++
.../camel-stax-starter/src/main/docs/stax.json | 41 ++++++++++++++++++
.../XMLTokenizeLanguageAutoConfiguration.java | 0
.../XMLTokenizeLanguageConfiguration.java | 0
.../src/main/resources/META-INF/spring.factories | 4 +-
.../src/main/docs/xml-jaxp.json | 48 ----------------------
.../src/main/resources/META-INF/spring.factories | 19 ---------
10 files changed, 62 insertions(+), 70 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/language.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/language.json
index e57952e8bbe..78164c76a25 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/language.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/language.json
@@ -29,7 +29,7 @@
"CamelLanguageScript": { "kind": "header", "displayName": "", "group":
"producer", "label": "", "required": false, "javaType": "String or Expression",
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "description": "The script to execute provided in the header. Takes
precedence over script configured on the endpoint.", "constantName":
"org.apache.camel.component.language.LanguageConstants#LANGUAGE_SCRIPT" }
},
"properties": {
- "languageName": { "kind": "path", "displayName": "Language Name", "group":
"producer", "label": "", "required": true, "type": "string", "javaType":
"java.lang.String", "enum": [ "bean", "constant", "exchangeProperty", "file",
"groovy", "header", "javascript", "jsonpath", "mvel", "ognl", "", "ref",
"simple", "spel", "sql", "terser", "tokenize", "xpath", "xquery", "xtokenize"
], "deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "description": "Sets the na [...]
+ "languageName": { "kind": "path", "displayName": "Language Name", "group":
"producer", "label": "", "required": true, "type": "string", "javaType":
"java.lang.String", "enum": [ "bean", "constant", "csimple", "datasonnet",
"exchangeProperty", "file", "groovy", "header", "hl7terser", "joor", "jq",
"jsonpath", "mvel", "ognl", "ref", "simple", "spel", "sql", "tokenize",
"xpath", "xquery", "xtokenize" ], "deprecated": false, "deprecationNote": "",
"autowired": false, "secret": false, "de [...]
"resourceUri": { "kind": "path", "displayName": "Resource Uri", "group":
"producer", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "description": "Path to the resource, or a reference to
lookup a bean in the Registry to use as the resource" },
"allowContextMapAll": { "kind": "parameter", "displayName": "Allow Context
Map All", "group": "producer", "label": "", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "description": "Sets whether the
context map should allow access to all details. By default only the message
body and headers can be accessed. This option can be enabled for full access to
the current Exchange and CamelContext. [...]
"binary": { "kind": "parameter", "displayName": "Binary", "group":
"producer", "label": "", "required": false, "type": "boolean", "javaType":
"boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "description": "Whether the script is binary content or
text content. By default the script is read as text content (eg
java.lang.String)" },
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/languages/xtokenize.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/languages/xtokenize.json
index 1baabee7e7b..9a47de478af 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/languages/xtokenize.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/languages/xtokenize.json
@@ -10,7 +10,7 @@
"javaType": "org.apache.camel.language.xtokenizer.XMLTokenizeLanguage",
"supportLevel": "Stable",
"groupId": "org.apache.camel.springboot",
- "artifactId": "camel-xml-jaxp-starter",
+ "artifactId": "camel-stax-starter",
"version": "3.19.0-SNAPSHOT",
"modelName": "xtokenize",
"modelJavaType": "org.apache.camel.model.language.XMLTokenizerExpression"
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/others.properties
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/others.properties
index d5c152dc214..3b402cc2412 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/others.properties
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/others.properties
@@ -34,5 +34,6 @@ swagger-java
undertow-spring-security
xml-io-dsl
xml-jaxb-dsl
+xml-jaxp
yaml-dsl
zipkin
\ No newline at end of file
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/others/xml-jaxp.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/others/xml-jaxp.json
new file mode 100644
index 00000000000..4480e7efc5a
--- /dev/null
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/others/xml-jaxp.json
@@ -0,0 +1,15 @@
+{
+ "other": {
+ "kind": "other",
+ "name": "xml-jaxp",
+ "title": "Xml Jaxp",
+ "description": "Camel XML JAXP",
+ "deprecated": false,
+ "firstVersion": "3.0.0",
+ "label": "core,xml",
+ "supportLevel": "Stable",
+ "groupId": "org.apache.camel.springboot",
+ "artifactId": "camel-xml-jaxp-starter",
+ "version": "3.19.0-SNAPSHOT"
+ }
+}
diff --git a/components-starter/camel-stax-starter/src/main/docs/stax.json
b/components-starter/camel-stax-starter/src/main/docs/stax.json
index 828ebf43f2d..6ab62f26c1a 100644
--- a/components-starter/camel-stax-starter/src/main/docs/stax.json
+++ b/components-starter/camel-stax-starter/src/main/docs/stax.json
@@ -10,6 +10,17 @@
"type":
"org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon$CustomizerProperties",
"sourceType":
"org.apache.camel.component.stax.springboot.StAXComponentConfiguration",
"sourceMethod": "getCustomizer()"
+ },
+ {
+ "name": "camel.language.xtokenize",
+ "type":
"org.apache.camel.language.xtokenizer.springboot.XMLTokenizeLanguageConfiguration",
+ "sourceType":
"org.apache.camel.language.xtokenizer.springboot.XMLTokenizeLanguageConfiguration"
+ },
+ {
+ "name": "camel.language.xtokenize.customizer",
+ "type":
"org.apache.camel.spring.boot.LanguageConfigurationPropertiesCommon$CustomizerProperties",
+ "sourceType":
"org.apache.camel.language.xtokenizer.springboot.XMLTokenizeLanguageConfiguration",
+ "sourceMethod": "getCustomizer()"
}
],
"properties": [
@@ -37,6 +48,36 @@
"description": "Whether the producer should be started lazy (on the
first message). By starting lazy you can use this to allow CamelContext and
routes to startup in situations where a producer may otherwise fail during
starting and cause the route to fail being started. By deferring this startup
to be lazy then the startup failure can be handled during routing messages via
Camel's routing error handlers. Beware that when the first message is processed
then creating and starting the [...]
"sourceType":
"org.apache.camel.component.stax.springboot.StAXComponentConfiguration",
"defaultValue": false
+ },
+ {
+ "name": "camel.language.xtokenize.customizer.enabled",
+ "type": "java.lang.Boolean",
+ "sourceType":
"org.apache.camel.spring.boot.LanguageConfigurationPropertiesCommon$CustomizerProperties"
+ },
+ {
+ "name": "camel.language.xtokenize.enabled",
+ "type": "java.lang.Boolean",
+ "description": "Whether to enable auto configuration of the xtokenize
language. This is enabled by default.",
+ "sourceType":
"org.apache.camel.language.xtokenizer.springboot.XMLTokenizeLanguageConfiguration"
+ },
+ {
+ "name": "camel.language.xtokenize.mode",
+ "type": "java.lang.String",
+ "description": "The extraction mode. The available extraction modes are:
i - injecting the contextual namespace bindings into the extracted token
(default) w - wrapping the extracted token in its ancestor context u -
unwrapping the extracted token to its child content t - extracting the text
content of the specified element",
+ "sourceType":
"org.apache.camel.language.xtokenizer.springboot.XMLTokenizeLanguageConfiguration"
+ },
+ {
+ "name": "camel.language.xtokenize.namespace",
+ "type": "java.util.List<org.apache.camel.model.PropertyDefinition>",
+ "description": "Injects the XML Namespaces of prefix - uri mappings",
+ "sourceType":
"org.apache.camel.language.xtokenizer.springboot.XMLTokenizeLanguageConfiguration"
+ },
+ {
+ "name": "camel.language.xtokenize.trim",
+ "type": "java.lang.Boolean",
+ "description": "Whether to trim the value to remove leading and trailing
whitespaces and line breaks",
+ "sourceType":
"org.apache.camel.language.xtokenizer.springboot.XMLTokenizeLanguageConfiguration",
+ "defaultValue": true
}
],
"hints": []
diff --git
a/components-starter/camel-xml-jaxp-starter/src/main/java/org/apache/camel/language/xtokenizer/springboot/XMLTokenizeLanguageAutoConfiguration.java
b/components-starter/camel-stax-starter/src/main/java/org/apache/camel/language/xtokenizer/springboot/XMLTokenizeLanguageAutoConfiguration.java
similarity index 100%
rename from
components-starter/camel-xml-jaxp-starter/src/main/java/org/apache/camel/language/xtokenizer/springboot/XMLTokenizeLanguageAutoConfiguration.java
rename to
components-starter/camel-stax-starter/src/main/java/org/apache/camel/language/xtokenizer/springboot/XMLTokenizeLanguageAutoConfiguration.java
diff --git
a/components-starter/camel-xml-jaxp-starter/src/main/java/org/apache/camel/language/xtokenizer/springboot/XMLTokenizeLanguageConfiguration.java
b/components-starter/camel-stax-starter/src/main/java/org/apache/camel/language/xtokenizer/springboot/XMLTokenizeLanguageConfiguration.java
similarity index 100%
rename from
components-starter/camel-xml-jaxp-starter/src/main/java/org/apache/camel/language/xtokenizer/springboot/XMLTokenizeLanguageConfiguration.java
rename to
components-starter/camel-stax-starter/src/main/java/org/apache/camel/language/xtokenizer/springboot/XMLTokenizeLanguageConfiguration.java
diff --git
a/components-starter/camel-stax-starter/src/main/resources/META-INF/spring.factories
b/components-starter/camel-stax-starter/src/main/resources/META-INF/spring.factories
index 905eb2cc0d2..917d2b1c786 100644
---
a/components-starter/camel-stax-starter/src/main/resources/META-INF/spring.factories
+++
b/components-starter/camel-stax-starter/src/main/resources/META-INF/spring.factories
@@ -15,4 +15,6 @@
## limitations under the License.
## ---------------------------------------------------------------------------
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.apache.camel.component.stax.springboot.StAXComponentAutoConfiguration
+org.apache.camel.component.stax.springboot.StAXComponentAutoConfiguration,\
+org.apache.camel.language.xtokenizer.springboot.XMLTokenizeLanguageAutoConfiguration
+
diff --git
a/components-starter/camel-xml-jaxp-starter/src/main/docs/xml-jaxp.json
b/components-starter/camel-xml-jaxp-starter/src/main/docs/xml-jaxp.json
deleted file mode 100644
index 5088f24e455..00000000000
--- a/components-starter/camel-xml-jaxp-starter/src/main/docs/xml-jaxp.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
- "groups": [
- {
- "name": "camel.language.xtokenize",
- "type":
"org.apache.camel.language.xtokenizer.springboot.XMLTokenizeLanguageConfiguration",
- "sourceType":
"org.apache.camel.language.xtokenizer.springboot.XMLTokenizeLanguageConfiguration"
- },
- {
- "name": "camel.language.xtokenize.customizer",
- "type":
"org.apache.camel.spring.boot.LanguageConfigurationPropertiesCommon$CustomizerProperties",
- "sourceType":
"org.apache.camel.language.xtokenizer.springboot.XMLTokenizeLanguageConfiguration",
- "sourceMethod": "getCustomizer()"
- }
- ],
- "properties": [
- {
- "name": "camel.language.xtokenize.customizer.enabled",
- "type": "java.lang.Boolean",
- "sourceType":
"org.apache.camel.spring.boot.LanguageConfigurationPropertiesCommon$CustomizerProperties"
- },
- {
- "name": "camel.language.xtokenize.enabled",
- "type": "java.lang.Boolean",
- "description": "Whether to enable auto configuration of the xtokenize
language. This is enabled by default.",
- "sourceType":
"org.apache.camel.language.xtokenizer.springboot.XMLTokenizeLanguageConfiguration"
- },
- {
- "name": "camel.language.xtokenize.mode",
- "type": "java.lang.String",
- "description": "The extraction mode. The available extraction modes are:
i - injecting the contextual namespace bindings into the extracted token
(default) w - wrapping the extracted token in its ancestor context u -
unwrapping the extracted token to its child content t - extracting the text
content of the specified element",
- "sourceType":
"org.apache.camel.language.xtokenizer.springboot.XMLTokenizeLanguageConfiguration"
- },
- {
- "name": "camel.language.xtokenize.namespace",
- "type": "java.util.List<org.apache.camel.model.PropertyDefinition>",
- "description": "Injects the XML Namespaces of prefix - uri mappings",
- "sourceType":
"org.apache.camel.language.xtokenizer.springboot.XMLTokenizeLanguageConfiguration"
- },
- {
- "name": "camel.language.xtokenize.trim",
- "type": "java.lang.Boolean",
- "description": "Whether to trim the value to remove leading and trailing
whitespaces and line breaks",
- "sourceType":
"org.apache.camel.language.xtokenizer.springboot.XMLTokenizeLanguageConfiguration",
- "defaultValue": true
- }
- ],
- "hints": []
-}
\ No newline at end of file
diff --git
a/components-starter/camel-xml-jaxp-starter/src/main/resources/META-INF/spring.factories
b/components-starter/camel-xml-jaxp-starter/src/main/resources/META-INF/spring.factories
deleted file mode 100644
index 0d76db26a04..00000000000
---
a/components-starter/camel-xml-jaxp-starter/src/main/resources/META-INF/spring.factories
+++ /dev/null
@@ -1,19 +0,0 @@
-## ---------------------------------------------------------------------------
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements. See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License. You may obtain a copy of the License at
-##
-## http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-## ---------------------------------------------------------------------------
-
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.apache.camel.language.xtokenizer.springboot.XMLTokenizeLanguageAutoConfiguration
