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 61360f7 CAMEL-17499: Renaming inconsistent data format names in model
61360f7 is described below
commit 61360f765c0c85ebed40c0c82f6a15a5d0fa09e0
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Wed Jan 19 10:56:50 2022 +0100
CAMEL-17499: Renaming inconsistent data format names in model
---
.../springboot/catalog/dataformats.properties | 2 +-
.../{yaml-snakeyaml.json => snakeYaml.json} | 2 +-
.../src/main/docs/snakeyaml.json | 30 +++++++++++-----------
.../SnakeYAMLDataFormatAutoConfiguration.java | 4 +--
.../SnakeYAMLDataFormatConfiguration.java | 6 ++---
5 files changed, 22 insertions(+), 22 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 1df6f38..622ba11 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
@@ -33,6 +33,7 @@ pgp
protobuf
protobufJackson
rss
+snakeYaml
soap
syslog
tarFile
@@ -43,6 +44,5 @@ univocityFixed
univocityTsv
xmlSecurity
xstream
-yaml-snakeyaml
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/yaml-snakeyaml.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/snakeYaml.json
similarity index 99%
rename from
catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/yaml-snakeyaml.json
rename to
catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/snakeYaml.json
index 8901c1d..be4ff8c 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/yaml-snakeyaml.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/snakeYaml.json
@@ -1,7 +1,7 @@
{
"dataformat": {
"kind": "dataformat",
- "name": "yaml-snakeyaml",
+ "name": "snakeYaml",
"title": "YAML SnakeYAML",
"description": "Marshal and unmarshal Java objects to and from YAML using
SnakeYAML",
"deprecated": false,
diff --git
a/components-starter/camel-snakeyaml-starter/src/main/docs/snakeyaml.json
b/components-starter/camel-snakeyaml-starter/src/main/docs/snakeyaml.json
index d3ac923..31906d9 100644
--- a/components-starter/camel-snakeyaml-starter/src/main/docs/snakeyaml.json
+++ b/components-starter/camel-snakeyaml-starter/src/main/docs/snakeyaml.json
@@ -1,12 +1,12 @@
{
"groups": [
{
- "name": "camel.dataformat.yaml-snakeyaml",
+ "name": "camel.dataformat.snake-yaml",
"type":
"org.apache.camel.component.snakeyaml.springboot.SnakeYAMLDataFormatConfiguration",
"sourceType":
"org.apache.camel.component.snakeyaml.springboot.SnakeYAMLDataFormatConfiguration"
},
{
- "name": "camel.dataformat.yaml-snakeyaml.customizer",
+ "name": "camel.dataformat.snake-yaml.customizer",
"type":
"org.apache.camel.spring.boot.DataFormatConfigurationPropertiesCommon$CustomizerProperties",
"sourceType":
"org.apache.camel.component.snakeyaml.springboot.SnakeYAMLDataFormatConfiguration",
"sourceMethod": "getCustomizer()"
@@ -14,76 +14,76 @@
],
"properties": [
{
- "name": "camel.dataformat.yaml-snakeyaml.allow-any-type",
+ "name": "camel.dataformat.snake-yaml.allow-any-type",
"type": "java.lang.Boolean",
"description": "Allow any class to be un-marshaled",
"sourceType":
"org.apache.camel.component.snakeyaml.springboot.SnakeYAMLDataFormatConfiguration",
"defaultValue": false
},
{
- "name": "camel.dataformat.yaml-snakeyaml.allow-recursive-keys",
+ "name": "camel.dataformat.snake-yaml.allow-recursive-keys",
"type": "java.lang.Boolean",
"description": "Set whether recursive keys are allowed.",
"sourceType":
"org.apache.camel.component.snakeyaml.springboot.SnakeYAMLDataFormatConfiguration",
"defaultValue": false
},
{
- "name": "camel.dataformat.yaml-snakeyaml.constructor",
+ "name": "camel.dataformat.snake-yaml.constructor",
"type": "java.lang.String",
"description": "BaseConstructor to construct incoming documents.",
"sourceType":
"org.apache.camel.component.snakeyaml.springboot.SnakeYAMLDataFormatConfiguration"
},
{
- "name": "camel.dataformat.yaml-snakeyaml.customizer.enabled",
+ "name": "camel.dataformat.snake-yaml.customizer.enabled",
"type": "java.lang.Boolean",
"sourceType":
"org.apache.camel.spring.boot.DataFormatConfigurationPropertiesCommon$CustomizerProperties"
},
{
- "name": "camel.dataformat.yaml-snakeyaml.dumper-options",
+ "name": "camel.dataformat.snake-yaml.dumper-options",
"type": "java.lang.String",
"description": "DumperOptions to configure outgoing objects.",
"sourceType":
"org.apache.camel.component.snakeyaml.springboot.SnakeYAMLDataFormatConfiguration"
},
{
- "name": "camel.dataformat.yaml-snakeyaml.enabled",
+ "name": "camel.dataformat.snake-yaml.enabled",
"type": "java.lang.Boolean",
- "description": "Whether to enable auto configuration of the
yaml-snakeyaml data format. This is enabled by default.",
+ "description": "Whether to enable auto configuration of the snakeYaml
data format. This is enabled by default.",
"sourceType":
"org.apache.camel.component.snakeyaml.springboot.SnakeYAMLDataFormatConfiguration"
},
{
- "name": "camel.dataformat.yaml-snakeyaml.max-aliases-for-collections",
+ "name": "camel.dataformat.snake-yaml.max-aliases-for-collections",
"type": "java.lang.Integer",
"description": "Set the maximum amount of aliases allowed for
collections.",
"sourceType":
"org.apache.camel.component.snakeyaml.springboot.SnakeYAMLDataFormatConfiguration",
"defaultValue": 50
},
{
- "name": "camel.dataformat.yaml-snakeyaml.pretty-flow",
+ "name": "camel.dataformat.snake-yaml.pretty-flow",
"type": "java.lang.Boolean",
"description": "Force the emitter to produce a pretty YAML document when
using the flow style.",
"sourceType":
"org.apache.camel.component.snakeyaml.springboot.SnakeYAMLDataFormatConfiguration",
"defaultValue": false
},
{
- "name": "camel.dataformat.yaml-snakeyaml.representer",
+ "name": "camel.dataformat.snake-yaml.representer",
"type": "java.lang.String",
"description": "Representer to emit outgoing objects.",
"sourceType":
"org.apache.camel.component.snakeyaml.springboot.SnakeYAMLDataFormatConfiguration"
},
{
- "name": "camel.dataformat.yaml-snakeyaml.resolver",
+ "name": "camel.dataformat.snake-yaml.resolver",
"type": "java.lang.String",
"description": "Resolver to detect implicit type",
"sourceType":
"org.apache.camel.component.snakeyaml.springboot.SnakeYAMLDataFormatConfiguration"
},
{
- "name": "camel.dataformat.yaml-snakeyaml.unmarshal-type",
+ "name": "camel.dataformat.snake-yaml.unmarshal-type",
"type": "java.lang.String",
"description": "Class name of the java type to use when unmarshalling",
"sourceType":
"org.apache.camel.component.snakeyaml.springboot.SnakeYAMLDataFormatConfiguration"
},
{
- "name":
"camel.dataformat.yaml-snakeyaml.use-application-context-class-loader",
+ "name":
"camel.dataformat.snake-yaml.use-application-context-class-loader",
"type": "java.lang.Boolean",
"description": "Use ApplicationContextClassLoader as custom ClassLoader",
"sourceType":
"org.apache.camel.component.snakeyaml.springboot.SnakeYAMLDataFormatConfiguration",
diff --git
a/components-starter/camel-snakeyaml-starter/src/main/java/org/apache/camel/component/snakeyaml/springboot/SnakeYAMLDataFormatAutoConfiguration.java
b/components-starter/camel-snakeyaml-starter/src/main/java/org/apache/camel/component/snakeyaml/springboot/SnakeYAMLDataFormatAutoConfiguration.java
index 30d3d65..b2052be 100644
---
a/components-starter/camel-snakeyaml-starter/src/main/java/org/apache/camel/component/snakeyaml/springboot/SnakeYAMLDataFormatAutoConfiguration.java
+++
b/components-starter/camel-snakeyaml-starter/src/main/java/org/apache/camel/component/snakeyaml/springboot/SnakeYAMLDataFormatAutoConfiguration.java
@@ -45,7 +45,7 @@ import org.springframework.context.annotation.Lazy;
@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({DataFormatConfigurationProperties.class,SnakeYAMLDataFormatConfiguration.class})
-@ConditionalOnHierarchicalProperties({"camel.dataformat",
"camel.dataformat.yaml-snakeyaml"})
+@ConditionalOnHierarchicalProperties({"camel.dataformat",
"camel.dataformat.snake-yaml"})
public class SnakeYAMLDataFormatAutoConfiguration {
@Autowired
@@ -72,7 +72,7 @@ public class SnakeYAMLDataFormatAutoConfiguration {
return HierarchicalPropertiesEvaluator.evaluate(
applicationContext,
"camel.dataformat.customizer",
- "camel.dataformat.yaml-snakeyaml.customizer")
+ "camel.dataformat.snake-yaml.customizer")
&& target instanceof SnakeYAMLDataFormat;
}
};
diff --git
a/components-starter/camel-snakeyaml-starter/src/main/java/org/apache/camel/component/snakeyaml/springboot/SnakeYAMLDataFormatConfiguration.java
b/components-starter/camel-snakeyaml-starter/src/main/java/org/apache/camel/component/snakeyaml/springboot/SnakeYAMLDataFormatConfiguration.java
index 88ee251..00f6f5a 100644
---
a/components-starter/camel-snakeyaml-starter/src/main/java/org/apache/camel/component/snakeyaml/springboot/SnakeYAMLDataFormatConfiguration.java
+++
b/components-starter/camel-snakeyaml-starter/src/main/java/org/apache/camel/component/snakeyaml/springboot/SnakeYAMLDataFormatConfiguration.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.yaml-snakeyaml")
+@ConfigurationProperties(prefix = "camel.dataformat.snake-yaml")
public class SnakeYAMLDataFormatConfiguration
extends
DataFormatConfigurationPropertiesCommon {
/**
- * Whether to enable auto configuration of the yaml-snakeyaml data format.
- * This is enabled by default.
+ * Whether to enable auto configuration of the snakeYaml data format. This
+ * is enabled by default.
*/
private Boolean enabled;
/**
