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 2016/07/04 12:15:57 UTC
camel git commit: CAMEL-10118: Fixed wrong generation of Spring Boot
auto configuraiton of data formats where there could be naming clashes.
Repository: camel
Updated Branches:
refs/heads/master 16cd1a77d -> 3b508f55d
CAMEL-10118: Fixed wrong generation of Spring Boot auto configuraiton of data formats where there could be naming clashes.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3b508f55
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3b508f55
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3b508f55
Branch: refs/heads/master
Commit: 3b508f55d24ab4baa5164189d052fb3b320bce02
Parents: 16cd1a7
Author: Claus Ibsen <da...@apache.org>
Authored: Mon Jul 4 14:15:46 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Jul 4 14:15:46 2016 +0200
----------------------------------------------------------------------
.../bindy/csv/springboot/BindyCsvDataFormatConfiguration.java | 2 +-
.../fixed/springboot/BindyFixedLengthDataFormatConfiguration.java | 2 +-
.../kvp/springboot/BindyKeyValuePairDataFormatConfiguration.java | 2 +-
.../component/gson/springboot/GsonDataFormatConfiguration.java | 2 +-
.../jackson/springboot/JacksonDataFormatConfiguration.java | 2 +-
.../johnzon/springboot/JohnzonDataFormatConfiguration.java | 2 +-
.../snakeyaml/springboot/SnakeYAMLDataFormatConfiguration.java | 2 +-
.../dataformat/xstream/springboot/JsonDataFormatConfiguration.java | 2 +-
.../zipfile/springboot/ZipFileDataFormatConfiguration.java | 2 +-
.../camel/maven/packaging/SpringBootAutoConfigurationMojo.java | 2 +-
10 files changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/3b508f55/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/csv/springboot/BindyCsvDataFormatConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/csv/springboot/BindyCsvDataFormatConfiguration.java b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/csv/springboot/BindyCsvDataFormatConfiguration.java
index 67f781b..b249e17 100644
--- a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/csv/springboot/BindyCsvDataFormatConfiguration.java
+++ b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/csv/springboot/BindyCsvDataFormatConfiguration.java
@@ -25,7 +25,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
*
* Generated by camel-package-maven-plugin - do not edit this file!
*/
-@ConfigurationProperties(prefix = "camel.dataformat.bindy")
+@ConfigurationProperties(prefix = "camel.dataformat.bindy-csv")
public class BindyCsvDataFormatConfiguration {
/**
http://git-wip-us.apache.org/repos/asf/camel/blob/3b508f55/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/fixed/springboot/BindyFixedLengthDataFormatConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/fixed/springboot/BindyFixedLengthDataFormatConfiguration.java b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/fixed/springboot/BindyFixedLengthDataFormatConfiguration.java
index 90c89bf..8931068 100644
--- a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/fixed/springboot/BindyFixedLengthDataFormatConfiguration.java
+++ b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/fixed/springboot/BindyFixedLengthDataFormatConfiguration.java
@@ -25,7 +25,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
*
* Generated by camel-package-maven-plugin - do not edit this file!
*/
-@ConfigurationProperties(prefix = "camel.dataformat.bindy")
+@ConfigurationProperties(prefix = "camel.dataformat.bindy-fixed")
public class BindyFixedLengthDataFormatConfiguration {
/**
http://git-wip-us.apache.org/repos/asf/camel/blob/3b508f55/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/kvp/springboot/BindyKeyValuePairDataFormatConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/kvp/springboot/BindyKeyValuePairDataFormatConfiguration.java b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/kvp/springboot/BindyKeyValuePairDataFormatConfiguration.java
index 63d823f..b30ed96 100644
--- a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/kvp/springboot/BindyKeyValuePairDataFormatConfiguration.java
+++ b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/kvp/springboot/BindyKeyValuePairDataFormatConfiguration.java
@@ -25,7 +25,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
*
* Generated by camel-package-maven-plugin - do not edit this file!
*/
-@ConfigurationProperties(prefix = "camel.dataformat.bindy")
+@ConfigurationProperties(prefix = "camel.dataformat.bindy-kvp")
public class BindyKeyValuePairDataFormatConfiguration {
/**
http://git-wip-us.apache.org/repos/asf/camel/blob/3b508f55/components/camel-gson/src/main/java/org/apache/camel/component/gson/springboot/GsonDataFormatConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-gson/src/main/java/org/apache/camel/component/gson/springboot/GsonDataFormatConfiguration.java b/components/camel-gson/src/main/java/org/apache/camel/component/gson/springboot/GsonDataFormatConfiguration.java
index 477e679..c4324a6 100644
--- a/components/camel-gson/src/main/java/org/apache/camel/component/gson/springboot/GsonDataFormatConfiguration.java
+++ b/components/camel-gson/src/main/java/org/apache/camel/component/gson/springboot/GsonDataFormatConfiguration.java
@@ -25,7 +25,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
*
* Generated by camel-package-maven-plugin - do not edit this file!
*/
-@ConfigurationProperties(prefix = "camel.dataformat.json")
+@ConfigurationProperties(prefix = "camel.dataformat.json-gson")
public class GsonDataFormatConfiguration {
/**
http://git-wip-us.apache.org/repos/asf/camel/blob/3b508f55/components/camel-jackson/src/main/java/org/apache/camel/component/jackson/springboot/JacksonDataFormatConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-jackson/src/main/java/org/apache/camel/component/jackson/springboot/JacksonDataFormatConfiguration.java b/components/camel-jackson/src/main/java/org/apache/camel/component/jackson/springboot/JacksonDataFormatConfiguration.java
index ee32606..57d06c4 100644
--- a/components/camel-jackson/src/main/java/org/apache/camel/component/jackson/springboot/JacksonDataFormatConfiguration.java
+++ b/components/camel-jackson/src/main/java/org/apache/camel/component/jackson/springboot/JacksonDataFormatConfiguration.java
@@ -25,7 +25,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
*
* Generated by camel-package-maven-plugin - do not edit this file!
*/
-@ConfigurationProperties(prefix = "camel.dataformat.json")
+@ConfigurationProperties(prefix = "camel.dataformat.json-jackson")
public class JacksonDataFormatConfiguration {
/**
http://git-wip-us.apache.org/repos/asf/camel/blob/3b508f55/components/camel-johnzon/src/main/java/org/apache/camel/component/johnzon/springboot/JohnzonDataFormatConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-johnzon/src/main/java/org/apache/camel/component/johnzon/springboot/JohnzonDataFormatConfiguration.java b/components/camel-johnzon/src/main/java/org/apache/camel/component/johnzon/springboot/JohnzonDataFormatConfiguration.java
index eb01d01..e3719c9 100644
--- a/components/camel-johnzon/src/main/java/org/apache/camel/component/johnzon/springboot/JohnzonDataFormatConfiguration.java
+++ b/components/camel-johnzon/src/main/java/org/apache/camel/component/johnzon/springboot/JohnzonDataFormatConfiguration.java
@@ -25,7 +25,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
*
* Generated by camel-package-maven-plugin - do not edit this file!
*/
-@ConfigurationProperties(prefix = "camel.dataformat.json")
+@ConfigurationProperties(prefix = "camel.dataformat.json-johnzon")
public class JohnzonDataFormatConfiguration {
/**
http://git-wip-us.apache.org/repos/asf/camel/blob/3b508f55/components/camel-snakeyaml/src/main/java/org/apache/camel/component/snakeyaml/springboot/SnakeYAMLDataFormatConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-snakeyaml/src/main/java/org/apache/camel/component/snakeyaml/springboot/SnakeYAMLDataFormatConfiguration.java b/components/camel-snakeyaml/src/main/java/org/apache/camel/component/snakeyaml/springboot/SnakeYAMLDataFormatConfiguration.java
index 5032391..ce78189 100644
--- a/components/camel-snakeyaml/src/main/java/org/apache/camel/component/snakeyaml/springboot/SnakeYAMLDataFormatConfiguration.java
+++ b/components/camel-snakeyaml/src/main/java/org/apache/camel/component/snakeyaml/springboot/SnakeYAMLDataFormatConfiguration.java
@@ -25,7 +25,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
*
* Generated by camel-package-maven-plugin - do not edit this file!
*/
-@ConfigurationProperties(prefix = "camel.dataformat.yaml")
+@ConfigurationProperties(prefix = "camel.dataformat.yaml-snakeyaml")
public class SnakeYAMLDataFormatConfiguration {
/**
http://git-wip-us.apache.org/repos/asf/camel/blob/3b508f55/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/springboot/JsonDataFormatConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/springboot/JsonDataFormatConfiguration.java b/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/springboot/JsonDataFormatConfiguration.java
index f5fce13..153dbc5 100644
--- a/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/springboot/JsonDataFormatConfiguration.java
+++ b/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/springboot/JsonDataFormatConfiguration.java
@@ -25,7 +25,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
*
* Generated by camel-package-maven-plugin - do not edit this file!
*/
-@ConfigurationProperties(prefix = "camel.dataformat.json")
+@ConfigurationProperties(prefix = "camel.dataformat.json-xstream")
public class JsonDataFormatConfiguration {
/**
http://git-wip-us.apache.org/repos/asf/camel/blob/3b508f55/components/camel-zipfile/src/main/java/org/apache/camel/dataformat/zipfile/springboot/ZipFileDataFormatConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-zipfile/src/main/java/org/apache/camel/dataformat/zipfile/springboot/ZipFileDataFormatConfiguration.java b/components/camel-zipfile/src/main/java/org/apache/camel/dataformat/zipfile/springboot/ZipFileDataFormatConfiguration.java
index 630e2bb..295c99b 100644
--- a/components/camel-zipfile/src/main/java/org/apache/camel/dataformat/zipfile/springboot/ZipFileDataFormatConfiguration.java
+++ b/components/camel-zipfile/src/main/java/org/apache/camel/dataformat/zipfile/springboot/ZipFileDataFormatConfiguration.java
@@ -23,7 +23,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
*
* Generated by camel-package-maven-plugin - do not edit this file!
*/
-@ConfigurationProperties(prefix = "camel.dataformat.zipFile")
+@ConfigurationProperties(prefix = "camel.dataformat.zipfile")
public class ZipFileDataFormatConfiguration {
/**
http://git-wip-us.apache.org/repos/asf/camel/blob/3b508f55/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java
----------------------------------------------------------------------
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java
index f758230..be93305 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java
@@ -276,7 +276,7 @@ public class SpringBootAutoConfigurationMojo extends AbstractMojo {
}
javaClass.getJavaDoc().setFullText(doc);
- String prefix = "camel.dataformat." + model.getModelName();
+ String prefix = "camel.dataformat." + model.getName();
javaClass.addAnnotation("org.springframework.boot.context.properties.ConfigurationProperties").setStringValue("prefix", prefix);
for (DataFormatOptionModel option : model.getDataFormatOptions()) {