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 5fe550d CAMEL-17499: Renaming inconsistent data format names in model
5fe550d is described below
commit 5fe550d7ec1b2ff8197ea6847e0c926ce5156ecf
Author: Claus Ibsen <[email protected]>
AuthorDate: Wed Jan 19 15:58:04 2022 +0100
CAMEL-17499: Renaming inconsistent data format names in model
---
.../springboot/catalog/dataformats.properties | 12 +++---
.../{json-fastjson.json => fastjson.json} | 2 +-
.../dataformats/{json-gson.json => gson.json} | 2 +-
.../{json-jackson.json => jackson.json} | 2 +-
.../{json-johnzon.json => johnzon.json} | 2 +-
.../dataformats/{json-jsonb.json => jsonb.json} | 2 +-
.../{json-xstream.json => xstreamJson.json} | 2 +-
.../camel/springboot/catalog/languages.properties | 1 -
.../src/main/docs/fastjson.json | 14 +++---
.../FastjsonDataFormatAutoConfiguration.java | 4 +-
.../FastjsonDataFormatConfiguration.java | 6 +--
.../camel-gson-starter/src/main/docs/gson.json | 16 +++----
.../GsonDataFormatAutoConfiguration.java | 4 +-
.../springboot/GsonDataFormatConfiguration.java | 6 +--
.../src/main/docs/jackson.json | 50 +++++++++++-----------
.../JacksonDataFormatAutoConfiguration.java | 4 +-
.../springboot/JacksonDataFormatConfiguration.java | 6 +--
.../src/main/docs/johnzon.json | 16 +++----
.../JohnzonDataFormatAutoConfiguration.java | 4 +-
.../springboot/JohnzonDataFormatConfiguration.java | 6 +--
.../camel-jsonb-starter/src/main/docs/jsonb.json | 16 +++----
.../JsonbDataFormatAutoConfiguration.java | 4 +-
.../springboot/JsonbDataFormatConfiguration.java | 6 +--
.../src/main/docs/xstream.json | 26 +++++------
.../JsonDataFormatAutoConfiguration.java | 4 +-
.../springboot/JsonDataFormatConfiguration.java | 6 +--
26 files changed, 111 insertions(+), 112 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats.properties
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats.properties
index 622ba11..10f6106 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats.properties
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats.properties
@@ -11,22 +11,21 @@ bindyKvp
cbor
crypto
csv
+fastjson
fhirJson
fhirXml
flatpack
grok
+gson
gzipDeflater
hl7
ical
+jackson
jacksonXml
jaxb
-json-fastjson
-json-gson
-json-jackson
-json-johnzon
-json-jsonb
-json-xstream
+johnzon
jsonApi
+jsonb
lzf
mimeMultipart
pgp
@@ -44,5 +43,6 @@ univocityFixed
univocityTsv
xmlSecurity
xstream
+xstreamJson
zipDeflater
zipFile
\ No newline at end of file
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/json-fastjson.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/fastjson.json
similarity index 97%
rename from
catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/json-fastjson.json
rename to
catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/fastjson.json
index 74eee9f..04a483a 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/json-fastjson.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/fastjson.json
@@ -1,7 +1,7 @@
{
"dataformat": {
"kind": "dataformat",
- "name": "json-fastjson",
+ "name": "fastjson",
"title": "JSON Fastjson",
"description": "Marshal POJOs to JSON and back using Fastjson",
"deprecated": false,
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/json-gson.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/gson.json
similarity index 98%
rename from
catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/json-gson.json
rename to
catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/gson.json
index 4b1b29d..038bc88 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/json-gson.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/gson.json
@@ -1,7 +1,7 @@
{
"dataformat": {
"kind": "dataformat",
- "name": "json-gson",
+ "name": "gson",
"title": "JSON Gson",
"description": "Marshal POJOs to JSON and back using Gson",
"deprecated": false,
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/json-jackson.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/jackson.json
similarity index 99%
rename from
catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/json-jackson.json
rename to
catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/jackson.json
index 1567f60..526bf88 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/json-jackson.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/jackson.json
@@ -1,7 +1,7 @@
{
"dataformat": {
"kind": "dataformat",
- "name": "json-jackson",
+ "name": "jackson",
"title": "JSON Jackson",
"description": "Marshal POJOs to JSON and back using Jackson",
"deprecated": false,
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/json-johnzon.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/johnzon.json
similarity index 98%
rename from
catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/json-johnzon.json
rename to
catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/johnzon.json
index 44d56f4..acecc59 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/json-johnzon.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/johnzon.json
@@ -1,7 +1,7 @@
{
"dataformat": {
"kind": "dataformat",
- "name": "json-johnzon",
+ "name": "johnzon",
"title": "JSON Johnzon",
"description": "Marshal POJOs to JSON and back using Johnzon",
"deprecated": false,
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/json-jsonb.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/jsonb.json
similarity index 98%
rename from
catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/json-jsonb.json
rename to
catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/jsonb.json
index f0e6623..993c059 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/json-jsonb.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/jsonb.json
@@ -1,7 +1,7 @@
{
"dataformat": {
"kind": "dataformat",
- "name": "json-jsonb",
+ "name": "jsonb",
"title": "JSON JSON-B",
"description": "Marshal POJOs to JSON and back using JSON-B.",
"deprecated": false,
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/json-xstream.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/xstreamJson.json
similarity index 98%
rename from
catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/json-xstream.json
rename to
catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/xstreamJson.json
index 5913968..771d542 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/json-xstream.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/xstreamJson.json
@@ -1,7 +1,7 @@
{
"dataformat": {
"kind": "dataformat",
- "name": "json-xstream",
+ "name": "xstreamJson",
"title": "JSON XStream",
"description": "Marshal POJOs to JSON and back using XStream",
"deprecated": false,
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/languages.properties
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/languages.properties
index 7a71fee..c91b6d0 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/languages.properties
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/languages.properties
@@ -6,7 +6,6 @@ joor
jsonpath
mvel
ognl
-simple
spel
xpath
xquery
diff --git
a/components-starter/camel-fastjson-starter/src/main/docs/fastjson.json
b/components-starter/camel-fastjson-starter/src/main/docs/fastjson.json
index c264001..3a16652 100644
--- a/components-starter/camel-fastjson-starter/src/main/docs/fastjson.json
+++ b/components-starter/camel-fastjson-starter/src/main/docs/fastjson.json
@@ -1,12 +1,12 @@
{
"groups": [
{
- "name": "camel.dataformat.json-fastjson",
+ "name": "camel.dataformat.fastjson",
"type":
"org.apache.camel.component.fastjson.springboot.FastjsonDataFormatConfiguration",
"sourceType":
"org.apache.camel.component.fastjson.springboot.FastjsonDataFormatConfiguration"
},
{
- "name": "camel.dataformat.json-fastjson.customizer",
+ "name": "camel.dataformat.fastjson.customizer",
"type":
"org.apache.camel.spring.boot.DataFormatConfigurationPropertiesCommon$CustomizerProperties",
"sourceType":
"org.apache.camel.component.fastjson.springboot.FastjsonDataFormatConfiguration",
"sourceMethod": "getCustomizer()"
@@ -14,25 +14,25 @@
],
"properties": [
{
- "name": "camel.dataformat.json-fastjson.content-type-header",
+ "name": "camel.dataformat.fastjson.content-type-header",
"type": "java.lang.Boolean",
"description": "Whether the data format should set the Content-Type
header with the type from the data format. For example application\/xml for
data formats marshalling to XML, or application\/json for data formats
marshalling to JSON",
"sourceType":
"org.apache.camel.component.fastjson.springboot.FastjsonDataFormatConfiguration",
"defaultValue": true
},
{
- "name": "camel.dataformat.json-fastjson.customizer.enabled",
+ "name": "camel.dataformat.fastjson.customizer.enabled",
"type": "java.lang.Boolean",
"sourceType":
"org.apache.camel.spring.boot.DataFormatConfigurationPropertiesCommon$CustomizerProperties"
},
{
- "name": "camel.dataformat.json-fastjson.enabled",
+ "name": "camel.dataformat.fastjson.enabled",
"type": "java.lang.Boolean",
- "description": "Whether to enable auto configuration of the
json-fastjson data format. This is enabled by default.",
+ "description": "Whether to enable auto configuration of the fastjson
data format. This is enabled by default.",
"sourceType":
"org.apache.camel.component.fastjson.springboot.FastjsonDataFormatConfiguration"
},
{
- "name": "camel.dataformat.json-fastjson.unmarshal-type",
+ "name": "camel.dataformat.fastjson.unmarshal-type",
"type": "java.lang.String",
"description": "Class name of the java type to use when unmarshalling",
"sourceType":
"org.apache.camel.component.fastjson.springboot.FastjsonDataFormatConfiguration"
diff --git
a/components-starter/camel-fastjson-starter/src/main/java/org/apache/camel/component/fastjson/springboot/FastjsonDataFormatAutoConfiguration.java
b/components-starter/camel-fastjson-starter/src/main/java/org/apache/camel/component/fastjson/springboot/FastjsonDataFormatAutoConfiguration.java
index 280fec2..3529eac 100644
---
a/components-starter/camel-fastjson-starter/src/main/java/org/apache/camel/component/fastjson/springboot/FastjsonDataFormatAutoConfiguration.java
+++
b/components-starter/camel-fastjson-starter/src/main/java/org/apache/camel/component/fastjson/springboot/FastjsonDataFormatAutoConfiguration.java
@@ -45,7 +45,7 @@ import org.springframework.context.annotation.Lazy;
@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({DataFormatConfigurationProperties.class,FastjsonDataFormatConfiguration.class})
-@ConditionalOnHierarchicalProperties({"camel.dataformat",
"camel.dataformat.json-fastjson"})
+@ConditionalOnHierarchicalProperties({"camel.dataformat",
"camel.dataformat.fastjson"})
public class FastjsonDataFormatAutoConfiguration {
@Autowired
@@ -72,7 +72,7 @@ public class FastjsonDataFormatAutoConfiguration {
return HierarchicalPropertiesEvaluator.evaluate(
applicationContext,
"camel.dataformat.customizer",
- "camel.dataformat.json-fastjson.customizer")
+ "camel.dataformat.fastjson.customizer")
&& target instanceof FastjsonDataFormat;
}
};
diff --git
a/components-starter/camel-fastjson-starter/src/main/java/org/apache/camel/component/fastjson/springboot/FastjsonDataFormatConfiguration.java
b/components-starter/camel-fastjson-starter/src/main/java/org/apache/camel/component/fastjson/springboot/FastjsonDataFormatConfiguration.java
index fe17262..e3f99e7 100644
---
a/components-starter/camel-fastjson-starter/src/main/java/org/apache/camel/component/fastjson/springboot/FastjsonDataFormatConfiguration.java
+++
b/components-starter/camel-fastjson-starter/src/main/java/org/apache/camel/component/fastjson/springboot/FastjsonDataFormatConfiguration.java
@@ -26,14 +26,14 @@ import
org.springframework.boot.context.properties.ConfigurationProperties;
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
-@ConfigurationProperties(prefix = "camel.dataformat.json-fastjson")
+@ConfigurationProperties(prefix = "camel.dataformat.fastjson")
public class FastjsonDataFormatConfiguration
extends
DataFormatConfigurationPropertiesCommon {
/**
- * Whether to enable auto configuration of the json-fastjson data format.
- * This is enabled by default.
+ * Whether to enable auto configuration of the fastjson data format. This
is
+ * enabled by default.
*/
private Boolean enabled;
/**
diff --git a/components-starter/camel-gson-starter/src/main/docs/gson.json
b/components-starter/camel-gson-starter/src/main/docs/gson.json
index 29d54fd..d6e3ada 100644
--- a/components-starter/camel-gson-starter/src/main/docs/gson.json
+++ b/components-starter/camel-gson-starter/src/main/docs/gson.json
@@ -1,12 +1,12 @@
{
"groups": [
{
- "name": "camel.dataformat.json-gson",
+ "name": "camel.dataformat.gson",
"type":
"org.apache.camel.component.gson.springboot.GsonDataFormatConfiguration",
"sourceType":
"org.apache.camel.component.gson.springboot.GsonDataFormatConfiguration"
},
{
- "name": "camel.dataformat.json-gson.customizer",
+ "name": "camel.dataformat.gson.customizer",
"type":
"org.apache.camel.spring.boot.DataFormatConfigurationPropertiesCommon$CustomizerProperties",
"sourceType":
"org.apache.camel.component.gson.springboot.GsonDataFormatConfiguration",
"sourceMethod": "getCustomizer()"
@@ -14,32 +14,32 @@
],
"properties": [
{
- "name": "camel.dataformat.json-gson.content-type-header",
+ "name": "camel.dataformat.gson.content-type-header",
"type": "java.lang.Boolean",
"description": "Whether the data format should set the Content-Type
header with the type from the data format. For example application\/xml for
data formats marshalling to XML, or application\/json for data formats
marshalling to JSON",
"sourceType":
"org.apache.camel.component.gson.springboot.GsonDataFormatConfiguration",
"defaultValue": true
},
{
- "name": "camel.dataformat.json-gson.customizer.enabled",
+ "name": "camel.dataformat.gson.customizer.enabled",
"type": "java.lang.Boolean",
"sourceType":
"org.apache.camel.spring.boot.DataFormatConfigurationPropertiesCommon$CustomizerProperties"
},
{
- "name": "camel.dataformat.json-gson.enabled",
+ "name": "camel.dataformat.gson.enabled",
"type": "java.lang.Boolean",
- "description": "Whether to enable auto configuration of the json-gson
data format. This is enabled by default.",
+ "description": "Whether to enable auto configuration of the gson data
format. This is enabled by default.",
"sourceType":
"org.apache.camel.component.gson.springboot.GsonDataFormatConfiguration"
},
{
- "name": "camel.dataformat.json-gson.pretty-print",
+ "name": "camel.dataformat.gson.pretty-print",
"type": "java.lang.Boolean",
"description": "To enable pretty printing output nicely formatted. Is by
default false.",
"sourceType":
"org.apache.camel.component.gson.springboot.GsonDataFormatConfiguration",
"defaultValue": false
},
{
- "name": "camel.dataformat.json-gson.unmarshal-type",
+ "name": "camel.dataformat.gson.unmarshal-type",
"type": "java.lang.String",
"description": "Class name of the java type to use when unmarshalling",
"sourceType":
"org.apache.camel.component.gson.springboot.GsonDataFormatConfiguration"
diff --git
a/components-starter/camel-gson-starter/src/main/java/org/apache/camel/component/gson/springboot/GsonDataFormatAutoConfiguration.java
b/components-starter/camel-gson-starter/src/main/java/org/apache/camel/component/gson/springboot/GsonDataFormatAutoConfiguration.java
index 7ab4be3..cdb7317 100644
---
a/components-starter/camel-gson-starter/src/main/java/org/apache/camel/component/gson/springboot/GsonDataFormatAutoConfiguration.java
+++
b/components-starter/camel-gson-starter/src/main/java/org/apache/camel/component/gson/springboot/GsonDataFormatAutoConfiguration.java
@@ -45,7 +45,7 @@ import org.springframework.context.annotation.Lazy;
@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({DataFormatConfigurationProperties.class,GsonDataFormatConfiguration.class})
-@ConditionalOnHierarchicalProperties({"camel.dataformat",
"camel.dataformat.json-gson"})
+@ConditionalOnHierarchicalProperties({"camel.dataformat",
"camel.dataformat.gson"})
public class GsonDataFormatAutoConfiguration {
@Autowired
@@ -72,7 +72,7 @@ public class GsonDataFormatAutoConfiguration {
return HierarchicalPropertiesEvaluator.evaluate(
applicationContext,
"camel.dataformat.customizer",
- "camel.dataformat.json-gson.customizer")
+ "camel.dataformat.gson.customizer")
&& target instanceof GsonDataFormat;
}
};
diff --git
a/components-starter/camel-gson-starter/src/main/java/org/apache/camel/component/gson/springboot/GsonDataFormatConfiguration.java
b/components-starter/camel-gson-starter/src/main/java/org/apache/camel/component/gson/springboot/GsonDataFormatConfiguration.java
index 10152bd..528232a 100644
---
a/components-starter/camel-gson-starter/src/main/java/org/apache/camel/component/gson/springboot/GsonDataFormatConfiguration.java
+++
b/components-starter/camel-gson-starter/src/main/java/org/apache/camel/component/gson/springboot/GsonDataFormatConfiguration.java
@@ -26,14 +26,14 @@ import
org.springframework.boot.context.properties.ConfigurationProperties;
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
-@ConfigurationProperties(prefix = "camel.dataformat.json-gson")
+@ConfigurationProperties(prefix = "camel.dataformat.gson")
public class GsonDataFormatConfiguration
extends
DataFormatConfigurationPropertiesCommon {
/**
- * Whether to enable auto configuration of the json-gson data format. This
- * is enabled by default.
+ * Whether to enable auto configuration of the gson data format. This is
+ * enabled by default.
*/
private Boolean enabled;
/**
diff --git
a/components-starter/camel-jackson-starter/src/main/docs/jackson.json
b/components-starter/camel-jackson-starter/src/main/docs/jackson.json
index 24211bf..e532aa2 100644
--- a/components-starter/camel-jackson-starter/src/main/docs/jackson.json
+++ b/components-starter/camel-jackson-starter/src/main/docs/jackson.json
@@ -1,12 +1,12 @@
{
"groups": [
{
- "name": "camel.dataformat.json-jackson",
+ "name": "camel.dataformat.jackson",
"type":
"org.apache.camel.component.jackson.springboot.JacksonDataFormatConfiguration",
"sourceType":
"org.apache.camel.component.jackson.springboot.JacksonDataFormatConfiguration"
},
{
- "name": "camel.dataformat.json-jackson.customizer",
+ "name": "camel.dataformat.jackson.customizer",
"type":
"org.apache.camel.spring.boot.DataFormatConfigurationPropertiesCommon$CustomizerProperties",
"sourceType":
"org.apache.camel.component.jackson.springboot.JacksonDataFormatConfiguration",
"sourceMethod": "getCustomizer()"
@@ -14,139 +14,139 @@
],
"properties": [
{
- "name": "camel.dataformat.json-jackson.allow-jms-type",
+ "name": "camel.dataformat.jackson.allow-jms-type",
"type": "java.lang.Boolean",
"description": "Used for JMS users to allow the JMSType header from the
JMS spec to specify a FQN classname to use to unmarshal to.",
"sourceType":
"org.apache.camel.component.jackson.springboot.JacksonDataFormatConfiguration",
"defaultValue": false
},
{
- "name": "camel.dataformat.json-jackson.allow-unmarshall-type",
+ "name": "camel.dataformat.jackson.allow-unmarshall-type",
"type": "java.lang.Boolean",
"description": "If enabled then Jackson is allowed to attempt to use the
CamelJacksonUnmarshalType header during the unmarshalling. This should only be
enabled when desired to be used.",
"sourceType":
"org.apache.camel.component.jackson.springboot.JacksonDataFormatConfiguration",
"defaultValue": false
},
{
- "name": "camel.dataformat.json-jackson.auto-discover-object-mapper",
+ "name": "camel.dataformat.jackson.auto-discover-object-mapper",
"type": "java.lang.Boolean",
"description": "If set to true then Jackson will lookup for an
objectMapper into the registry",
"sourceType":
"org.apache.camel.component.jackson.springboot.JacksonDataFormatConfiguration",
"defaultValue": false
},
{
- "name": "camel.dataformat.json-jackson.auto-discover-schema-resolver",
+ "name": "camel.dataformat.jackson.auto-discover-schema-resolver",
"type": "java.lang.Boolean",
"description": "When not disabled, the SchemaResolver will be looked up
into the registry",
"sourceType":
"org.apache.camel.component.jackson.springboot.JacksonDataFormatConfiguration",
"defaultValue": true
},
{
- "name": "camel.dataformat.json-jackson.collection-type",
+ "name": "camel.dataformat.jackson.collection-type",
"type": "java.lang.String",
"description": "Refers to a custom collection type to lookup in the
registry to use. This option should rarely be used, but allows to use different
collection types than java.util.Collection based as default.",
"sourceType":
"org.apache.camel.component.jackson.springboot.JacksonDataFormatConfiguration"
},
{
- "name": "camel.dataformat.json-jackson.content-type-header",
+ "name": "camel.dataformat.jackson.content-type-header",
"type": "java.lang.Boolean",
"description": "Whether the data format should set the Content-Type
header with the type from the data format. For example application\/xml for
data formats marshalling to XML, or application\/json for data formats
marshalling to JSON",
"sourceType":
"org.apache.camel.component.jackson.springboot.JacksonDataFormatConfiguration",
"defaultValue": true
},
{
- "name": "camel.dataformat.json-jackson.customizer.enabled",
+ "name": "camel.dataformat.jackson.customizer.enabled",
"type": "java.lang.Boolean",
"sourceType":
"org.apache.camel.spring.boot.DataFormatConfigurationPropertiesCommon$CustomizerProperties"
},
{
- "name": "camel.dataformat.json-jackson.disable-features",
+ "name": "camel.dataformat.jackson.disable-features",
"type": "java.lang.String",
"description": "Set of features to disable on the Jackson
com.fasterxml.jackson.databind.ObjectMapper. The features should be a name that
matches a enum from com.fasterxml.jackson.databind.SerializationFeature,
com.fasterxml.jackson.databind.DeserializationFeature, or
com.fasterxml.jackson.databind.MapperFeature Multiple features can be separated
by comma",
"sourceType":
"org.apache.camel.component.jackson.springboot.JacksonDataFormatConfiguration"
},
{
- "name": "camel.dataformat.json-jackson.enable-features",
+ "name": "camel.dataformat.jackson.enable-features",
"type": "java.lang.String",
"description": "Set of features to enable on the Jackson
com.fasterxml.jackson.databind.ObjectMapper. The features should be a name that
matches a enum from com.fasterxml.jackson.databind.SerializationFeature,
com.fasterxml.jackson.databind.DeserializationFeature, or
com.fasterxml.jackson.databind.MapperFeature Multiple features can be separated
by comma",
"sourceType":
"org.apache.camel.component.jackson.springboot.JacksonDataFormatConfiguration"
},
{
- "name": "camel.dataformat.json-jackson.enabled",
+ "name": "camel.dataformat.jackson.enabled",
"type": "java.lang.Boolean",
- "description": "Whether to enable auto configuration of the json-jackson
data format. This is enabled by default.",
+ "description": "Whether to enable auto configuration of the jackson data
format. This is enabled by default.",
"sourceType":
"org.apache.camel.component.jackson.springboot.JacksonDataFormatConfiguration"
},
{
- "name": "camel.dataformat.json-jackson.include",
+ "name": "camel.dataformat.jackson.include",
"type": "java.lang.String",
"description": "If you want to marshal a pojo to JSON, and the pojo has
some fields with null values. And you want to skip these null values, you can
set this option to NON_NULL",
"sourceType":
"org.apache.camel.component.jackson.springboot.JacksonDataFormatConfiguration"
},
{
- "name": "camel.dataformat.json-jackson.json-view",
+ "name": "camel.dataformat.jackson.json-view",
"type": "java.lang.String",
"description": "When marshalling a POJO to JSON you might want to
exclude certain fields from the JSON output. With Jackson you can use JSON
views to accomplish this. This option is to refer to the class which has
JsonView annotations",
"sourceType":
"org.apache.camel.component.jackson.springboot.JacksonDataFormatConfiguration"
},
{
- "name": "camel.dataformat.json-jackson.module-class-names",
+ "name": "camel.dataformat.jackson.module-class-names",
"type": "java.lang.String",
"description": "To use custom Jackson modules
com.fasterxml.jackson.databind.Module specified as a String with FQN class
names. Multiple classes can be separated by comma.",
"sourceType":
"org.apache.camel.component.jackson.springboot.JacksonDataFormatConfiguration"
},
{
- "name": "camel.dataformat.json-jackson.module-refs",
+ "name": "camel.dataformat.jackson.module-refs",
"type": "java.lang.String",
"description": "To use custom Jackson modules referred from the Camel
registry. Multiple modules can be separated by comma.",
"sourceType":
"org.apache.camel.component.jackson.springboot.JacksonDataFormatConfiguration"
},
{
- "name": "camel.dataformat.json-jackson.naming-strategy",
+ "name": "camel.dataformat.jackson.naming-strategy",
"type": "java.lang.String",
"description": "If set then Jackson will use the the defined Property
Naming Strategy.Possible values are: LOWER_CAMEL_CASE, LOWER_DOT_CASE,
LOWER_CASE, KEBAB_CASE, SNAKE_CASE and UPPER_CAMEL_CASE",
"sourceType":
"org.apache.camel.component.jackson.springboot.JacksonDataFormatConfiguration"
},
{
- "name": "camel.dataformat.json-jackson.object-mapper",
+ "name": "camel.dataformat.jackson.object-mapper",
"type": "java.lang.String",
"description": "Lookup and use the existing ObjectMapper with the given
id when using Jackson.",
"sourceType":
"org.apache.camel.component.jackson.springboot.JacksonDataFormatConfiguration"
},
{
- "name": "camel.dataformat.json-jackson.pretty-print",
+ "name": "camel.dataformat.jackson.pretty-print",
"type": "java.lang.Boolean",
"description": "To enable pretty printing output nicely formatted. Is by
default false.",
"sourceType":
"org.apache.camel.component.jackson.springboot.JacksonDataFormatConfiguration",
"defaultValue": false
},
{
- "name": "camel.dataformat.json-jackson.schema-resolver",
+ "name": "camel.dataformat.jackson.schema-resolver",
"type": "java.lang.String",
"description": "Optional schema resolver used to lookup schemas for the
data in transit.",
"sourceType":
"org.apache.camel.component.jackson.springboot.JacksonDataFormatConfiguration"
},
{
- "name": "camel.dataformat.json-jackson.timezone",
+ "name": "camel.dataformat.jackson.timezone",
"type": "java.lang.String",
"description": "If set then Jackson will use the Timezone when
marshalling\/unmarshalling. This option will have no effect on the others Json
DataFormat, like gson, fastjson and xstream.",
"sourceType":
"org.apache.camel.component.jackson.springboot.JacksonDataFormatConfiguration"
},
{
- "name": "camel.dataformat.json-jackson.unmarshal-type",
+ "name": "camel.dataformat.jackson.unmarshal-type",
"type": "java.lang.String",
"description": "Class name of the java type to use when unmarshalling",
"sourceType":
"org.apache.camel.component.jackson.springboot.JacksonDataFormatConfiguration"
},
{
- "name": "camel.dataformat.json-jackson.use-default-object-mapper",
+ "name": "camel.dataformat.jackson.use-default-object-mapper",
"type": "java.lang.Boolean",
"description": "Whether to lookup and use default Jackson ObjectMapper
from the registry.",
"sourceType":
"org.apache.camel.component.jackson.springboot.JacksonDataFormatConfiguration",
"defaultValue": true
},
{
- "name": "camel.dataformat.json-jackson.use-list",
+ "name": "camel.dataformat.jackson.use-list",
"type": "java.lang.Boolean",
"description": "To unmarshal to a List of Map or a List of Pojo.",
"sourceType":
"org.apache.camel.component.jackson.springboot.JacksonDataFormatConfiguration",
diff --git
a/components-starter/camel-jackson-starter/src/main/java/org/apache/camel/component/jackson/springboot/JacksonDataFormatAutoConfiguration.java
b/components-starter/camel-jackson-starter/src/main/java/org/apache/camel/component/jackson/springboot/JacksonDataFormatAutoConfiguration.java
index 3875a26..2e0d606 100644
---
a/components-starter/camel-jackson-starter/src/main/java/org/apache/camel/component/jackson/springboot/JacksonDataFormatAutoConfiguration.java
+++
b/components-starter/camel-jackson-starter/src/main/java/org/apache/camel/component/jackson/springboot/JacksonDataFormatAutoConfiguration.java
@@ -45,7 +45,7 @@ import org.springframework.context.annotation.Lazy;
@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({DataFormatConfigurationProperties.class,JacksonDataFormatConfiguration.class})
-@ConditionalOnHierarchicalProperties({"camel.dataformat",
"camel.dataformat.json-jackson"})
+@ConditionalOnHierarchicalProperties({"camel.dataformat",
"camel.dataformat.jackson"})
public class JacksonDataFormatAutoConfiguration {
@Autowired
@@ -72,7 +72,7 @@ public class JacksonDataFormatAutoConfiguration {
return HierarchicalPropertiesEvaluator.evaluate(
applicationContext,
"camel.dataformat.customizer",
- "camel.dataformat.json-jackson.customizer")
+ "camel.dataformat.jackson.customizer")
&& target instanceof JacksonDataFormat;
}
};
diff --git
a/components-starter/camel-jackson-starter/src/main/java/org/apache/camel/component/jackson/springboot/JacksonDataFormatConfiguration.java
b/components-starter/camel-jackson-starter/src/main/java/org/apache/camel/component/jackson/springboot/JacksonDataFormatConfiguration.java
index 9fc83be..905e894 100644
---
a/components-starter/camel-jackson-starter/src/main/java/org/apache/camel/component/jackson/springboot/JacksonDataFormatConfiguration.java
+++
b/components-starter/camel-jackson-starter/src/main/java/org/apache/camel/component/jackson/springboot/JacksonDataFormatConfiguration.java
@@ -26,14 +26,14 @@ import
org.springframework.boot.context.properties.ConfigurationProperties;
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
-@ConfigurationProperties(prefix = "camel.dataformat.json-jackson")
+@ConfigurationProperties(prefix = "camel.dataformat.jackson")
public class JacksonDataFormatConfiguration
extends
DataFormatConfigurationPropertiesCommon {
/**
- * Whether to enable auto configuration of the json-jackson data format.
- * This is enabled by default.
+ * Whether to enable auto configuration of the jackson data format. This is
+ * enabled by default.
*/
private Boolean enabled;
/**
diff --git
a/components-starter/camel-johnzon-starter/src/main/docs/johnzon.json
b/components-starter/camel-johnzon-starter/src/main/docs/johnzon.json
index f44bbfe..1faa3d4 100644
--- a/components-starter/camel-johnzon-starter/src/main/docs/johnzon.json
+++ b/components-starter/camel-johnzon-starter/src/main/docs/johnzon.json
@@ -1,12 +1,12 @@
{
"groups": [
{
- "name": "camel.dataformat.json-johnzon",
+ "name": "camel.dataformat.johnzon",
"type":
"org.apache.camel.component.johnzon.springboot.JohnzonDataFormatConfiguration",
"sourceType":
"org.apache.camel.component.johnzon.springboot.JohnzonDataFormatConfiguration"
},
{
- "name": "camel.dataformat.json-johnzon.customizer",
+ "name": "camel.dataformat.johnzon.customizer",
"type":
"org.apache.camel.spring.boot.DataFormatConfigurationPropertiesCommon$CustomizerProperties",
"sourceType":
"org.apache.camel.component.johnzon.springboot.JohnzonDataFormatConfiguration",
"sourceMethod": "getCustomizer()"
@@ -14,31 +14,31 @@
],
"properties": [
{
- "name": "camel.dataformat.json-johnzon.customizer.enabled",
+ "name": "camel.dataformat.johnzon.customizer.enabled",
"type": "java.lang.Boolean",
"sourceType":
"org.apache.camel.spring.boot.DataFormatConfigurationPropertiesCommon$CustomizerProperties"
},
{
- "name": "camel.dataformat.json-johnzon.enabled",
+ "name": "camel.dataformat.johnzon.enabled",
"type": "java.lang.Boolean",
- "description": "Whether to enable auto configuration of the json-johnzon
data format. This is enabled by default.",
+ "description": "Whether to enable auto configuration of the johnzon data
format. This is enabled by default.",
"sourceType":
"org.apache.camel.component.johnzon.springboot.JohnzonDataFormatConfiguration"
},
{
- "name": "camel.dataformat.json-johnzon.object-mapper",
+ "name": "camel.dataformat.johnzon.object-mapper",
"type": "java.lang.String",
"description": "Lookup and use the existing Mapper with the given id.",
"sourceType":
"org.apache.camel.component.johnzon.springboot.JohnzonDataFormatConfiguration"
},
{
- "name": "camel.dataformat.json-johnzon.pretty-print",
+ "name": "camel.dataformat.johnzon.pretty-print",
"type": "java.lang.Boolean",
"description": "To enable pretty printing output nicely formatted. Is by
default false.",
"sourceType":
"org.apache.camel.component.johnzon.springboot.JohnzonDataFormatConfiguration",
"defaultValue": false
},
{
- "name": "camel.dataformat.json-johnzon.unmarshal-type",
+ "name": "camel.dataformat.johnzon.unmarshal-type",
"type": "java.lang.String",
"description": "Class name of the java type to use when unmarshalling",
"sourceType":
"org.apache.camel.component.johnzon.springboot.JohnzonDataFormatConfiguration"
diff --git
a/components-starter/camel-johnzon-starter/src/main/java/org/apache/camel/component/johnzon/springboot/JohnzonDataFormatAutoConfiguration.java
b/components-starter/camel-johnzon-starter/src/main/java/org/apache/camel/component/johnzon/springboot/JohnzonDataFormatAutoConfiguration.java
index fc08ab2..c2443fd 100644
---
a/components-starter/camel-johnzon-starter/src/main/java/org/apache/camel/component/johnzon/springboot/JohnzonDataFormatAutoConfiguration.java
+++
b/components-starter/camel-johnzon-starter/src/main/java/org/apache/camel/component/johnzon/springboot/JohnzonDataFormatAutoConfiguration.java
@@ -45,7 +45,7 @@ import org.springframework.context.annotation.Lazy;
@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({DataFormatConfigurationProperties.class,JohnzonDataFormatConfiguration.class})
-@ConditionalOnHierarchicalProperties({"camel.dataformat",
"camel.dataformat.json-johnzon"})
+@ConditionalOnHierarchicalProperties({"camel.dataformat",
"camel.dataformat.johnzon"})
public class JohnzonDataFormatAutoConfiguration {
@Autowired
@@ -72,7 +72,7 @@ public class JohnzonDataFormatAutoConfiguration {
return HierarchicalPropertiesEvaluator.evaluate(
applicationContext,
"camel.dataformat.customizer",
- "camel.dataformat.json-johnzon.customizer")
+ "camel.dataformat.johnzon.customizer")
&& target instanceof JohnzonDataFormat;
}
};
diff --git
a/components-starter/camel-johnzon-starter/src/main/java/org/apache/camel/component/johnzon/springboot/JohnzonDataFormatConfiguration.java
b/components-starter/camel-johnzon-starter/src/main/java/org/apache/camel/component/johnzon/springboot/JohnzonDataFormatConfiguration.java
index 2d77836..637b82e 100644
---
a/components-starter/camel-johnzon-starter/src/main/java/org/apache/camel/component/johnzon/springboot/JohnzonDataFormatConfiguration.java
+++
b/components-starter/camel-johnzon-starter/src/main/java/org/apache/camel/component/johnzon/springboot/JohnzonDataFormatConfiguration.java
@@ -26,14 +26,14 @@ import
org.springframework.boot.context.properties.ConfigurationProperties;
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
-@ConfigurationProperties(prefix = "camel.dataformat.json-johnzon")
+@ConfigurationProperties(prefix = "camel.dataformat.johnzon")
public class JohnzonDataFormatConfiguration
extends
DataFormatConfigurationPropertiesCommon {
/**
- * Whether to enable auto configuration of the json-johnzon data format.
- * This is enabled by default.
+ * Whether to enable auto configuration of the johnzon data format. This is
+ * enabled by default.
*/
private Boolean enabled;
/**
diff --git a/components-starter/camel-jsonb-starter/src/main/docs/jsonb.json
b/components-starter/camel-jsonb-starter/src/main/docs/jsonb.json
index 2d747a9..da9548d 100644
--- a/components-starter/camel-jsonb-starter/src/main/docs/jsonb.json
+++ b/components-starter/camel-jsonb-starter/src/main/docs/jsonb.json
@@ -1,12 +1,12 @@
{
"groups": [
{
- "name": "camel.dataformat.json-jsonb",
+ "name": "camel.dataformat.jsonb",
"type":
"org.apache.camel.component.jsonb.springboot.JsonbDataFormatConfiguration",
"sourceType":
"org.apache.camel.component.jsonb.springboot.JsonbDataFormatConfiguration"
},
{
- "name": "camel.dataformat.json-jsonb.customizer",
+ "name": "camel.dataformat.jsonb.customizer",
"type":
"org.apache.camel.spring.boot.DataFormatConfigurationPropertiesCommon$CustomizerProperties",
"sourceType":
"org.apache.camel.component.jsonb.springboot.JsonbDataFormatConfiguration",
"sourceMethod": "getCustomizer()"
@@ -14,31 +14,31 @@
],
"properties": [
{
- "name": "camel.dataformat.json-jsonb.customizer.enabled",
+ "name": "camel.dataformat.jsonb.customizer.enabled",
"type": "java.lang.Boolean",
"sourceType":
"org.apache.camel.spring.boot.DataFormatConfigurationPropertiesCommon$CustomizerProperties"
},
{
- "name": "camel.dataformat.json-jsonb.enabled",
+ "name": "camel.dataformat.jsonb.enabled",
"type": "java.lang.Boolean",
- "description": "Whether to enable auto configuration of the json-jsonb
data format. This is enabled by default.",
+ "description": "Whether to enable auto configuration of the jsonb data
format. This is enabled by default.",
"sourceType":
"org.apache.camel.component.jsonb.springboot.JsonbDataFormatConfiguration"
},
{
- "name": "camel.dataformat.json-jsonb.object-mapper",
+ "name": "camel.dataformat.jsonb.object-mapper",
"type": "java.lang.String",
"description": "Lookup and use the existing Jsonb instance with the
given id.",
"sourceType":
"org.apache.camel.component.jsonb.springboot.JsonbDataFormatConfiguration"
},
{
- "name": "camel.dataformat.json-jsonb.pretty-print",
+ "name": "camel.dataformat.jsonb.pretty-print",
"type": "java.lang.Boolean",
"description": "To enable pretty printing output nicely formatted. Is by
default false.",
"sourceType":
"org.apache.camel.component.jsonb.springboot.JsonbDataFormatConfiguration",
"defaultValue": false
},
{
- "name": "camel.dataformat.json-jsonb.unmarshal-type",
+ "name": "camel.dataformat.jsonb.unmarshal-type",
"type": "java.lang.String",
"description": "Class name of the java type to use when unmarshalling",
"sourceType":
"org.apache.camel.component.jsonb.springboot.JsonbDataFormatConfiguration"
diff --git
a/components-starter/camel-jsonb-starter/src/main/java/org/apache/camel/component/jsonb/springboot/JsonbDataFormatAutoConfiguration.java
b/components-starter/camel-jsonb-starter/src/main/java/org/apache/camel/component/jsonb/springboot/JsonbDataFormatAutoConfiguration.java
index f924e86..73777a4 100644
---
a/components-starter/camel-jsonb-starter/src/main/java/org/apache/camel/component/jsonb/springboot/JsonbDataFormatAutoConfiguration.java
+++
b/components-starter/camel-jsonb-starter/src/main/java/org/apache/camel/component/jsonb/springboot/JsonbDataFormatAutoConfiguration.java
@@ -45,7 +45,7 @@ import org.springframework.context.annotation.Lazy;
@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({DataFormatConfigurationProperties.class,JsonbDataFormatConfiguration.class})
-@ConditionalOnHierarchicalProperties({"camel.dataformat",
"camel.dataformat.json-jsonb"})
+@ConditionalOnHierarchicalProperties({"camel.dataformat",
"camel.dataformat.jsonb"})
public class JsonbDataFormatAutoConfiguration {
@Autowired
@@ -72,7 +72,7 @@ public class JsonbDataFormatAutoConfiguration {
return HierarchicalPropertiesEvaluator.evaluate(
applicationContext,
"camel.dataformat.customizer",
- "camel.dataformat.json-jsonb.customizer")
+ "camel.dataformat.jsonb.customizer")
&& target instanceof JsonbDataFormat;
}
};
diff --git
a/components-starter/camel-jsonb-starter/src/main/java/org/apache/camel/component/jsonb/springboot/JsonbDataFormatConfiguration.java
b/components-starter/camel-jsonb-starter/src/main/java/org/apache/camel/component/jsonb/springboot/JsonbDataFormatConfiguration.java
index 4e52b55..b39e24a 100644
---
a/components-starter/camel-jsonb-starter/src/main/java/org/apache/camel/component/jsonb/springboot/JsonbDataFormatConfiguration.java
+++
b/components-starter/camel-jsonb-starter/src/main/java/org/apache/camel/component/jsonb/springboot/JsonbDataFormatConfiguration.java
@@ -26,14 +26,14 @@ import
org.springframework.boot.context.properties.ConfigurationProperties;
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
-@ConfigurationProperties(prefix = "camel.dataformat.json-jsonb")
+@ConfigurationProperties(prefix = "camel.dataformat.jsonb")
public class JsonbDataFormatConfiguration
extends
DataFormatConfigurationPropertiesCommon {
/**
- * Whether to enable auto configuration of the json-jsonb data format. This
- * is enabled by default.
+ * Whether to enable auto configuration of the jsonb data format. This is
+ * enabled by default.
*/
private Boolean enabled;
/**
diff --git
a/components-starter/camel-xstream-starter/src/main/docs/xstream.json
b/components-starter/camel-xstream-starter/src/main/docs/xstream.json
index 51127f4..25e1e61 100644
--- a/components-starter/camel-xstream-starter/src/main/docs/xstream.json
+++ b/components-starter/camel-xstream-starter/src/main/docs/xstream.json
@@ -1,22 +1,22 @@
{
"groups": [
{
- "name": "camel.dataformat.json-xstream",
+ "name": "camel.dataformat.xstream",
+ "type":
"org.apache.camel.dataformat.xstream.springboot.XStreamDataFormatConfiguration",
+ "sourceType":
"org.apache.camel.dataformat.xstream.springboot.XStreamDataFormatConfiguration"
+ },
+ {
+ "name": "camel.dataformat.xstream-json",
"type":
"org.apache.camel.dataformat.xstream.springboot.JsonDataFormatConfiguration",
"sourceType":
"org.apache.camel.dataformat.xstream.springboot.JsonDataFormatConfiguration"
},
{
- "name": "camel.dataformat.json-xstream.customizer",
+ "name": "camel.dataformat.xstream-json.customizer",
"type":
"org.apache.camel.spring.boot.DataFormatConfigurationPropertiesCommon$CustomizerProperties",
"sourceType":
"org.apache.camel.dataformat.xstream.springboot.JsonDataFormatConfiguration",
"sourceMethod": "getCustomizer()"
},
{
- "name": "camel.dataformat.xstream",
- "type":
"org.apache.camel.dataformat.xstream.springboot.XStreamDataFormatConfiguration",
- "sourceType":
"org.apache.camel.dataformat.xstream.springboot.XStreamDataFormatConfiguration"
- },
- {
"name": "camel.dataformat.xstream.customizer",
"type":
"org.apache.camel.spring.boot.DataFormatConfigurationPropertiesCommon$CustomizerProperties",
"sourceType":
"org.apache.camel.dataformat.xstream.springboot.XStreamDataFormatConfiguration",
@@ -25,32 +25,32 @@
],
"properties": [
{
- "name": "camel.dataformat.json-xstream.content-type-header",
+ "name": "camel.dataformat.xstream-json.content-type-header",
"type": "java.lang.Boolean",
"description": "Whether the data format should set the Content-Type
header with the type from the data format. For example application\/xml for
data formats marshalling to XML, or application\/json for data formats
marshalling to JSON",
"sourceType":
"org.apache.camel.dataformat.xstream.springboot.JsonDataFormatConfiguration",
"defaultValue": true
},
{
- "name": "camel.dataformat.json-xstream.customizer.enabled",
+ "name": "camel.dataformat.xstream-json.customizer.enabled",
"type": "java.lang.Boolean",
"sourceType":
"org.apache.camel.spring.boot.DataFormatConfigurationPropertiesCommon$CustomizerProperties"
},
{
- "name": "camel.dataformat.json-xstream.drop-root-node",
+ "name": "camel.dataformat.xstream-json.drop-root-node",
"type": "java.lang.Boolean",
"description": "Whether XStream will drop the root node in the generated
JSon. You may want to enable this when using POJOs; as then the written object
will include the class name as root node, which is often not intended to be
written in the JSON output.",
"sourceType":
"org.apache.camel.dataformat.xstream.springboot.JsonDataFormatConfiguration",
"defaultValue": false
},
{
- "name": "camel.dataformat.json-xstream.enabled",
+ "name": "camel.dataformat.xstream-json.enabled",
"type": "java.lang.Boolean",
- "description": "Whether to enable auto configuration of the json-xstream
data format. This is enabled by default.",
+ "description": "Whether to enable auto configuration of the xstreamJson
data format. This is enabled by default.",
"sourceType":
"org.apache.camel.dataformat.xstream.springboot.JsonDataFormatConfiguration"
},
{
- "name": "camel.dataformat.json-xstream.pretty-print",
+ "name": "camel.dataformat.xstream-json.pretty-print",
"type": "java.lang.Boolean",
"description": "To enable pretty printing output nicely formatted. Is by
default false.",
"sourceType":
"org.apache.camel.dataformat.xstream.springboot.JsonDataFormatConfiguration",
diff --git
a/components-starter/camel-xstream-starter/src/main/java/org/apache/camel/dataformat/xstream/springboot/JsonDataFormatAutoConfiguration.java
b/components-starter/camel-xstream-starter/src/main/java/org/apache/camel/dataformat/xstream/springboot/JsonDataFormatAutoConfiguration.java
index 3067cfb..26a12c1 100644
---
a/components-starter/camel-xstream-starter/src/main/java/org/apache/camel/dataformat/xstream/springboot/JsonDataFormatAutoConfiguration.java
+++
b/components-starter/camel-xstream-starter/src/main/java/org/apache/camel/dataformat/xstream/springboot/JsonDataFormatAutoConfiguration.java
@@ -45,7 +45,7 @@ import org.springframework.context.annotation.Lazy;
@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({DataFormatConfigurationProperties.class,JsonDataFormatConfiguration.class})
-@ConditionalOnHierarchicalProperties({"camel.dataformat",
"camel.dataformat.json-xstream"})
+@ConditionalOnHierarchicalProperties({"camel.dataformat",
"camel.dataformat.xstream-json"})
public class JsonDataFormatAutoConfiguration {
@Autowired
@@ -72,7 +72,7 @@ public class JsonDataFormatAutoConfiguration {
return HierarchicalPropertiesEvaluator.evaluate(
applicationContext,
"camel.dataformat.customizer",
- "camel.dataformat.json-xstream.customizer")
+ "camel.dataformat.xstream-json.customizer")
&& target instanceof JsonDataFormat;
}
};
diff --git
a/components-starter/camel-xstream-starter/src/main/java/org/apache/camel/dataformat/xstream/springboot/JsonDataFormatConfiguration.java
b/components-starter/camel-xstream-starter/src/main/java/org/apache/camel/dataformat/xstream/springboot/JsonDataFormatConfiguration.java
index 82d5618..6c62a30 100644
---
a/components-starter/camel-xstream-starter/src/main/java/org/apache/camel/dataformat/xstream/springboot/JsonDataFormatConfiguration.java
+++
b/components-starter/camel-xstream-starter/src/main/java/org/apache/camel/dataformat/xstream/springboot/JsonDataFormatConfiguration.java
@@ -26,14 +26,14 @@ import
org.springframework.boot.context.properties.ConfigurationProperties;
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
-@ConfigurationProperties(prefix = "camel.dataformat.json-xstream")
+@ConfigurationProperties(prefix = "camel.dataformat.xstream-json")
public class JsonDataFormatConfiguration
extends
DataFormatConfigurationPropertiesCommon {
/**
- * Whether to enable auto configuration of the json-xstream data format.
- * This is enabled by default.
+ * Whether to enable auto configuration of the xstreamJson data format.
This
+ * is enabled by default.
*/
private Boolean enabled;
/**
