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.git
The following commit(s) were added to refs/heads/main by this push:
new 3b7fc55 CAMEL-17499: Renaming inconsistent data format names in model
3b7fc55 is described below
commit 3b7fc55a6aca40694705e1502d9a05109c15d801
Author: Claus Ibsen <[email protected]>
AuthorDate: Tue Jan 18 15:26:39 2022 +0100
CAMEL-17499: Renaming inconsistent data format names in model
---
.../org/apache/camel/catalog/dataformats.properties | 6 +++---
.../apache/camel/catalog/dataformats/bindyCsv.json | 2 +-
.../{bindy-fixed.json => bindyFixed.json} | 2 +-
.../apache/camel/catalog/dataformats/bindyKvp.json | 2 +-
.../org/apache/camel/catalog/CamelCatalogTest.java | 20 ++++++++++----------
.../{bindy-csv-dataformat => bindyCsv-dataformat} | 0
...{bindy-fixed-dataformat => bindyFixed-dataformat} | 0
.../{bindy-kvp-dataformat => bindyKvp-dataformat} | 0
.../services/org/apache/camel/dataformat.properties | 2 +-
.../apache/camel/dataformat/{bindy-csv => bindyCsv} | 0
.../camel/dataformat/{bindy-fixed => bindyFixed} | 0
.../apache/camel/dataformat/{bindy-kvp => bindyKvp} | 0
.../apache/camel/dataformat/bindy/csv/bindyCsv.json | 2 +-
.../fixed/{bindy-fixed.json => bindyFixed.json} | 2 +-
.../apache/camel/dataformat/bindy/kvp/bindyKvp.json | 2 +-
.../camel-bindy/src/main/docs/bindy-dataformat.adoc | 2 +-
.../dataformat/bindy/csv/BindyCsvDataFormat.java | 4 ++--
.../bindy/fixed/BindyFixedLengthDataFormat.java | 4 ++--
.../bindy/kvp/BindyKeyValuePairDataFormat.java | 4 ++--
.../camel/model/dataformat/BindyDataFormat.java | 6 +++---
.../org/apache/camel/main/dataformats.properties | 6 +++---
.../modules/dataformats/examples/json/bindy-csv.json | 1 -
.../dataformats/examples/json/bindy-fixed.json | 1 -
.../modules/dataformats/examples/json/bindy-kvp.json | 1 -
.../modules/dataformats/examples/json/bindyCsv.json | 1 +
.../dataformats/examples/json/bindyFixed.json | 1 +
.../modules/dataformats/examples/json/bindyKvp.json | 1 +
.../ROOT/pages/camel-3x-upgrade-guide-3_15.adoc | 7 +++++--
.../camel/maven/packaging/PackageDataFormatMojo.java | 14 +++++++-------
29 files changed, 48 insertions(+), 45 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats.properties
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats.properties
index 7ba32b4..1945cd1 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats.properties
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats.properties
@@ -5,9 +5,9 @@ avro-jackson
barcode
base64
beanio
-bindy-csv
-bindy-fixed
-bindy-kvp
+bindyCsv
+bindyFixed
+bindyKvp
cbor
crypto
csv
diff --git
a/components/camel-bindy/src/generated/resources/org/apache/camel/dataformat/bindy/csv/bindy-csv.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/bindyCsv.json
similarity index 99%
rename from
components/camel-bindy/src/generated/resources/org/apache/camel/dataformat/bindy/csv/bindy-csv.json
rename to
catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/bindyCsv.json
index 5563c4f..4ec72c3 100644
---
a/components/camel-bindy/src/generated/resources/org/apache/camel/dataformat/bindy/csv/bindy-csv.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/bindyCsv.json
@@ -1,7 +1,7 @@
{
"dataformat": {
"kind": "dataformat",
- "name": "bindy-csv",
+ "name": "bindyCsv",
"title": "Bindy CSV",
"description": "Marshal and unmarshal between POJOs and Comma separated
values (CSV) format using Camel Bindy",
"deprecated": false,
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/bindy-fixed.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/bindyFixed.json
similarity index 98%
rename from
catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/bindy-fixed.json
rename to
catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/bindyFixed.json
index f46b44f..1f9113d 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/bindy-fixed.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/bindyFixed.json
@@ -1,7 +1,7 @@
{
"dataformat": {
"kind": "dataformat",
- "name": "bindy-fixed",
+ "name": "bindyFixed",
"title": "Bindy Fixed Length",
"description": "Marshal and unmarshal between POJOs and fixed field length
format using Camel Bindy",
"deprecated": false,
diff --git
a/components/camel-bindy/src/generated/resources/org/apache/camel/dataformat/bindy/kvp/bindy-kvp.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/bindyKvp.json
similarity index 99%
rename from
components/camel-bindy/src/generated/resources/org/apache/camel/dataformat/bindy/kvp/bindy-kvp.json
rename to
catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/bindyKvp.json
index 02db066..a1033ad 100644
---
a/components/camel-bindy/src/generated/resources/org/apache/camel/dataformat/bindy/kvp/bindy-kvp.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/bindyKvp.json
@@ -1,7 +1,7 @@
{
"dataformat": {
"kind": "dataformat",
- "name": "bindy-kvp",
+ "name": "bindyKvp",
"title": "Bindy Key Value Pair",
"description": "Marshal and unmarshal between POJOs and key-value pair
(KVP) format using Camel Bindy",
"deprecated": false,
diff --git
a/catalog/camel-catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
b/catalog/camel-catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
index efe8c21..7219d66 100644
---
a/catalog/camel-catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
+++
b/catalog/camel-catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
@@ -100,7 +100,7 @@ public class CamelCatalogTest {
public void testFindDataFormatNames() {
List<String> names = catalog.findDataFormatNames();
assertNotNull(names);
- assertTrue(names.contains("bindy-csv"));
+ assertTrue(names.contains("bindyCsv"));
assertTrue(names.contains("hl7"));
assertTrue(names.contains("jaxb"));
assertTrue(names.contains("syslog"));
@@ -1332,29 +1332,29 @@ public class CamelCatalogTest {
@Test
public void testValidateConfigurationPropertyDataformat() {
- String text = "camel.dataformat.bindy-csv.type=csv";
+ String text = "camel.dataformat.bindyCsv.type=csv";
ConfigurationPropertiesValidationResult result =
catalog.validateConfigurationProperty(text);
assertTrue(result.isSuccess());
- text = "camel.dataformat.bindy-csv.locale=us";
+ text = "camel.dataformat.bindyCsv.locale=us";
result = catalog.validateConfigurationProperty(text);
assertTrue(result.isSuccess());
- text = "camel.dataformat.bindy-csv.allowEmptyStream=abc";
+ text = "camel.dataformat.bindyCsv.allowEmptyStream=abc";
result = catalog.validateConfigurationProperty(text);
assertFalse(result.isSuccess());
- assertEquals("abc",
result.getInvalidBoolean().get("camel.dataformat.bindy-csv.allowEmptyStream"));
+ assertEquals("abc",
result.getInvalidBoolean().get("camel.dataformat.bindyCsv.allowEmptyStream"));
- text = "camel.dataformat.bindy-csv.foo=abc";
+ text = "camel.dataformat.bindyCsv.foo=abc";
result = catalog.validateConfigurationProperty(text);
assertFalse(result.isSuccess());
-
assertTrue(result.getUnknown().contains("camel.dataformat.bindy-csv.foo"));
+
assertTrue(result.getUnknown().contains("camel.dataformat.bindyCsv.foo"));
- text = "camel.dataformat.bindy-csv.type=abc";
+ text = "camel.dataformat.bindyCsv.type=abc";
result = catalog.validateConfigurationProperty(text);
assertFalse(result.isSuccess());
- assertEquals("abc",
result.getInvalidEnum().get("camel.dataformat.bindy-csv.type"));
- List<String> list =
result.getEnumChoices("camel.dataformat.bindy-csv.type");
+ assertEquals("abc",
result.getInvalidEnum().get("camel.dataformat.bindyCsv.type"));
+ List<String> list =
result.getEnumChoices("camel.dataformat.bindyCsv.type");
assertEquals(3, list.size());
assertEquals("Csv", list.get(0));
assertEquals("Fixed", list.get(1));
diff --git
a/components/camel-bindy/src/generated/resources/META-INF/services/org/apache/camel/configurer/bindy-csv-dataformat
b/components/camel-bindy/src/generated/resources/META-INF/services/org/apache/camel/configurer/bindyCsv-dataformat
similarity index 100%
rename from
components/camel-bindy/src/generated/resources/META-INF/services/org/apache/camel/configurer/bindy-csv-dataformat
rename to
components/camel-bindy/src/generated/resources/META-INF/services/org/apache/camel/configurer/bindyCsv-dataformat
diff --git
a/components/camel-bindy/src/generated/resources/META-INF/services/org/apache/camel/configurer/bindy-fixed-dataformat
b/components/camel-bindy/src/generated/resources/META-INF/services/org/apache/camel/configurer/bindyFixed-dataformat
similarity index 100%
rename from
components/camel-bindy/src/generated/resources/META-INF/services/org/apache/camel/configurer/bindy-fixed-dataformat
rename to
components/camel-bindy/src/generated/resources/META-INF/services/org/apache/camel/configurer/bindyFixed-dataformat
diff --git
a/components/camel-bindy/src/generated/resources/META-INF/services/org/apache/camel/configurer/bindy-kvp-dataformat
b/components/camel-bindy/src/generated/resources/META-INF/services/org/apache/camel/configurer/bindyKvp-dataformat
similarity index 100%
rename from
components/camel-bindy/src/generated/resources/META-INF/services/org/apache/camel/configurer/bindy-kvp-dataformat
rename to
components/camel-bindy/src/generated/resources/META-INF/services/org/apache/camel/configurer/bindyKvp-dataformat
diff --git
a/components/camel-bindy/src/generated/resources/META-INF/services/org/apache/camel/dataformat.properties
b/components/camel-bindy/src/generated/resources/META-INF/services/org/apache/camel/dataformat.properties
index e322b0a..dc585be 100644
---
a/components/camel-bindy/src/generated/resources/META-INF/services/org/apache/camel/dataformat.properties
+++
b/components/camel-bindy/src/generated/resources/META-INF/services/org/apache/camel/dataformat.properties
@@ -1,5 +1,5 @@
# Generated by camel build tools - do NOT edit this file!
-dataFormats=bindy-csv bindy-fixed bindy-kvp
+dataFormats=bindyCsv bindyFixed bindyKvp
groupId=org.apache.camel
artifactId=camel-bindy
version=3.15.0-SNAPSHOT
diff --git
a/components/camel-bindy/src/generated/resources/META-INF/services/org/apache/camel/dataformat/bindy-csv
b/components/camel-bindy/src/generated/resources/META-INF/services/org/apache/camel/dataformat/bindyCsv
similarity index 100%
rename from
components/camel-bindy/src/generated/resources/META-INF/services/org/apache/camel/dataformat/bindy-csv
rename to
components/camel-bindy/src/generated/resources/META-INF/services/org/apache/camel/dataformat/bindyCsv
diff --git
a/components/camel-bindy/src/generated/resources/META-INF/services/org/apache/camel/dataformat/bindy-fixed
b/components/camel-bindy/src/generated/resources/META-INF/services/org/apache/camel/dataformat/bindyFixed
similarity index 100%
rename from
components/camel-bindy/src/generated/resources/META-INF/services/org/apache/camel/dataformat/bindy-fixed
rename to
components/camel-bindy/src/generated/resources/META-INF/services/org/apache/camel/dataformat/bindyFixed
diff --git
a/components/camel-bindy/src/generated/resources/META-INF/services/org/apache/camel/dataformat/bindy-kvp
b/components/camel-bindy/src/generated/resources/META-INF/services/org/apache/camel/dataformat/bindyKvp
similarity index 100%
rename from
components/camel-bindy/src/generated/resources/META-INF/services/org/apache/camel/dataformat/bindy-kvp
rename to
components/camel-bindy/src/generated/resources/META-INF/services/org/apache/camel/dataformat/bindyKvp
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/bindy-csv.json
b/components/camel-bindy/src/generated/resources/org/apache/camel/dataformat/bindy/csv/bindyCsv.json
similarity index 99%
rename from
catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/bindy-csv.json
rename to
components/camel-bindy/src/generated/resources/org/apache/camel/dataformat/bindy/csv/bindyCsv.json
index 5563c4f..4ec72c3 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/bindy-csv.json
+++
b/components/camel-bindy/src/generated/resources/org/apache/camel/dataformat/bindy/csv/bindyCsv.json
@@ -1,7 +1,7 @@
{
"dataformat": {
"kind": "dataformat",
- "name": "bindy-csv",
+ "name": "bindyCsv",
"title": "Bindy CSV",
"description": "Marshal and unmarshal between POJOs and Comma separated
values (CSV) format using Camel Bindy",
"deprecated": false,
diff --git
a/components/camel-bindy/src/generated/resources/org/apache/camel/dataformat/bindy/fixed/bindy-fixed.json
b/components/camel-bindy/src/generated/resources/org/apache/camel/dataformat/bindy/fixed/bindyFixed.json
similarity index 98%
rename from
components/camel-bindy/src/generated/resources/org/apache/camel/dataformat/bindy/fixed/bindy-fixed.json
rename to
components/camel-bindy/src/generated/resources/org/apache/camel/dataformat/bindy/fixed/bindyFixed.json
index f46b44f..1f9113d 100644
---
a/components/camel-bindy/src/generated/resources/org/apache/camel/dataformat/bindy/fixed/bindy-fixed.json
+++
b/components/camel-bindy/src/generated/resources/org/apache/camel/dataformat/bindy/fixed/bindyFixed.json
@@ -1,7 +1,7 @@
{
"dataformat": {
"kind": "dataformat",
- "name": "bindy-fixed",
+ "name": "bindyFixed",
"title": "Bindy Fixed Length",
"description": "Marshal and unmarshal between POJOs and fixed field length
format using Camel Bindy",
"deprecated": false,
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/bindy-kvp.json
b/components/camel-bindy/src/generated/resources/org/apache/camel/dataformat/bindy/kvp/bindyKvp.json
similarity index 99%
rename from
catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/bindy-kvp.json
rename to
components/camel-bindy/src/generated/resources/org/apache/camel/dataformat/bindy/kvp/bindyKvp.json
index 02db066..a1033ad 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/bindy-kvp.json
+++
b/components/camel-bindy/src/generated/resources/org/apache/camel/dataformat/bindy/kvp/bindyKvp.json
@@ -1,7 +1,7 @@
{
"dataformat": {
"kind": "dataformat",
- "name": "bindy-kvp",
+ "name": "bindyKvp",
"title": "Bindy Key Value Pair",
"description": "Marshal and unmarshal between POJOs and key-value pair
(KVP) format using Camel Bindy",
"deprecated": false,
diff --git a/components/camel-bindy/src/main/docs/bindy-dataformat.adoc
b/components/camel-bindy/src/main/docs/bindy-dataformat.adoc
index 6579e2a..00bb86e 100644
--- a/components/camel-bindy/src/main/docs/bindy-dataformat.adoc
+++ b/components/camel-bindy/src/main/docs/bindy-dataformat.adoc
@@ -58,7 +58,7 @@ you can put multiple models in the same package.
== Options
-:shortName: bindy-csv
+:shortName: bindyCsv
include::partial$dataformat-options.adoc[]
== Annotations
diff --git
a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/csv/BindyCsvDataFormat.java
b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/csv/BindyCsvDataFormat.java
index 93c1681..46cf599 100644
---
a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/csv/BindyCsvDataFormat.java
+++
b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/csv/BindyCsvDataFormat.java
@@ -51,7 +51,7 @@ import org.slf4j.LoggerFactory;
/**
* Marshal and unmarshal between POJOs and Comma separated values (CSV) format
using Camel Bindy
*/
-@Dataformat("bindy-csv")
+@Dataformat("bindyCsv")
public class BindyCsvDataFormat extends BindyAbstractDataFormat {
private static final Logger LOG =
LoggerFactory.getLogger(BindyCsvDataFormat.class);
@@ -64,7 +64,7 @@ public class BindyCsvDataFormat extends
BindyAbstractDataFormat {
@Override
public String getDataFormatName() {
- return "bindy-csv";
+ return "bindyCsv";
}
@Override
diff --git
a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/fixed/BindyFixedLengthDataFormat.java
b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/fixed/BindyFixedLengthDataFormat.java
index 192754f..6bb3fa6 100644
---
a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/fixed/BindyFixedLengthDataFormat.java
+++
b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/fixed/BindyFixedLengthDataFormat.java
@@ -44,7 +44,7 @@ import org.slf4j.LoggerFactory;
/**
* Marshal and unmarshal between POJOs and fixed field length format using
Camel Bindy
*/
-@Dataformat("bindy-fixed")
+@Dataformat("bindyFixed")
public class BindyFixedLengthDataFormat extends BindyAbstractDataFormat {
public static final String CAMEL_BINDY_FIXED_LENGTH_HEADER =
"CamelBindyFixedLengthHeader";
@@ -64,7 +64,7 @@ public class BindyFixedLengthDataFormat extends
BindyAbstractDataFormat {
@Override
public String getDataFormatName() {
- return "bindy-fixed";
+ return "bindyFixed";
}
@Override
diff --git
a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/kvp/BindyKeyValuePairDataFormat.java
b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/kvp/BindyKeyValuePairDataFormat.java
index 429f798..b79c0dc 100644
---
a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/kvp/BindyKeyValuePairDataFormat.java
+++
b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/kvp/BindyKeyValuePairDataFormat.java
@@ -48,7 +48,7 @@ import org.slf4j.LoggerFactory;
/**
* Marshal and unmarshal between POJOs and key-value pair (KVP) format using
Camel Bindy
*/
-@Dataformat("bindy-kvp")
+@Dataformat("bindyKvp")
public class BindyKeyValuePairDataFormat extends BindyAbstractDataFormat {
private static final Logger LOG =
LoggerFactory.getLogger(BindyKeyValuePairDataFormat.class);
@@ -62,7 +62,7 @@ public class BindyKeyValuePairDataFormat extends
BindyAbstractDataFormat {
@Override
public String getDataFormatName() {
- return "bindy-kvp";
+ return "bindyKvp";
}
@Override
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/BindyDataFormat.java
b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/BindyDataFormat.java
index f6765ee..025e29e 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/BindyDataFormat.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/BindyDataFormat.java
@@ -73,11 +73,11 @@ public class BindyDataFormat extends DataFormatDefinition {
@Override
public String getDataFormatName() {
if ("Csv".equals(type)) {
- return "bindy-csv";
+ return "bindyCsv";
} else if ("Fixed".equals(type)) {
- return "bindy-fixed";
+ return "bindyFixed";
} else {
- return "bindy-kvp";
+ return "bindyKvp";
}
}
diff --git
a/core/camel-main/src/generated/resources/org/apache/camel/main/dataformats.properties
b/core/camel-main/src/generated/resources/org/apache/camel/main/dataformats.properties
index 7ba32b4..1945cd1 100644
---
a/core/camel-main/src/generated/resources/org/apache/camel/main/dataformats.properties
+++
b/core/camel-main/src/generated/resources/org/apache/camel/main/dataformats.properties
@@ -5,9 +5,9 @@ avro-jackson
barcode
base64
beanio
-bindy-csv
-bindy-fixed
-bindy-kvp
+bindyCsv
+bindyFixed
+bindyKvp
cbor
crypto
csv
diff --git a/docs/components/modules/dataformats/examples/json/bindy-csv.json
b/docs/components/modules/dataformats/examples/json/bindy-csv.json
deleted file mode 120000
index 6a8737b..0000000
--- a/docs/components/modules/dataformats/examples/json/bindy-csv.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../components/camel-bindy/src/generated/resources/org/apache/camel/dataformat/bindy/csv/bindy-csv.json
\ No newline at end of file
diff --git a/docs/components/modules/dataformats/examples/json/bindy-fixed.json
b/docs/components/modules/dataformats/examples/json/bindy-fixed.json
deleted file mode 120000
index 368e0d4..0000000
--- a/docs/components/modules/dataformats/examples/json/bindy-fixed.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../components/camel-bindy/src/generated/resources/org/apache/camel/dataformat/bindy/fixed/bindy-fixed.json
\ No newline at end of file
diff --git a/docs/components/modules/dataformats/examples/json/bindy-kvp.json
b/docs/components/modules/dataformats/examples/json/bindy-kvp.json
deleted file mode 120000
index 3d5fe74..0000000
--- a/docs/components/modules/dataformats/examples/json/bindy-kvp.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../components/camel-bindy/src/generated/resources/org/apache/camel/dataformat/bindy/kvp/bindy-kvp.json
\ No newline at end of file
diff --git a/docs/components/modules/dataformats/examples/json/bindyCsv.json
b/docs/components/modules/dataformats/examples/json/bindyCsv.json
new file mode 120000
index 0000000..c12f812
--- /dev/null
+++ b/docs/components/modules/dataformats/examples/json/bindyCsv.json
@@ -0,0 +1 @@
+../../../../../../components/camel-bindy/src/generated/resources/org/apache/camel/dataformat/bindy/csv/bindyCsv.json
\ No newline at end of file
diff --git a/docs/components/modules/dataformats/examples/json/bindyFixed.json
b/docs/components/modules/dataformats/examples/json/bindyFixed.json
new file mode 120000
index 0000000..ea459d4
--- /dev/null
+++ b/docs/components/modules/dataformats/examples/json/bindyFixed.json
@@ -0,0 +1 @@
+../../../../../../components/camel-bindy/src/generated/resources/org/apache/camel/dataformat/bindy/fixed/bindyFixed.json
\ No newline at end of file
diff --git a/docs/components/modules/dataformats/examples/json/bindyKvp.json
b/docs/components/modules/dataformats/examples/json/bindyKvp.json
new file mode 120000
index 0000000..8ad5ce7
--- /dev/null
+++ b/docs/components/modules/dataformats/examples/json/bindyKvp.json
@@ -0,0 +1 @@
+../../../../../../components/camel-bindy/src/generated/resources/org/apache/camel/dataformat/bindy/kvp/bindyKvp.json
\ No newline at end of file
diff --git
a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_15.adoc
b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_15.adoc
index efff100..7e967e7 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_15.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_15.adoc
@@ -46,16 +46,19 @@ The data formats naming has been made consistent to use
Camel Case:
[width="100%",cols="1m,1m",options="header"]
|====
| Old Name | New Name
+| bindy-csv | bindyCsv
+| bindy-fixed | bindyFixed
+| bindy-kvp | bindyKvp
| gzip-deflater | gzipDeflater
-| zip-deflater | zipDeflater
| jacksonxml | jacksonXml
| mime-multipart | mimeMultipart
| secureXML | xmlSecurity
| soapjaxb | soap
+| tarfile | tarFile
| univociy-csv | univociyCsv
| univociy-fixed | univociyFixed
| univociy-tsv | univociyTsv
-| tarfile | tarFile
+| zip-deflater | zipDeflater
| zipfile | zipFile
|====
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java
index b58a78d..ea17dd9 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java
@@ -342,13 +342,13 @@ public class PackageDataFormatMojo extends
AbstractGeneratorMojo {
if ("type".equals(option.getName()) &&
"bindy".equals(model.getModelName())) {
switch (name) {
- case "bindy-csv":
+ case "bindyCsv":
option.setDefaultValue("Csv");
break;
- case "bindy-fixed":
+ case "bindyFixed":
option.setDefaultValue("Fixed");
break;
- case "bindy-kvp":
+ case "bindyKvp":
option.setDefaultValue("KeyValue");
break;
default:
@@ -428,7 +428,7 @@ public class PackageDataFormatMojo extends
AbstractGeneratorMojo {
if ("json-gson".equals(name) || "json-jackson".equals(name) ||
"json-johnzon".equals(name)
|| "json-xstream".equals(name) || "json-fastjson".equals(name)
|| "json-jsonb".equals(name)) {
return "json";
- } else if ("bindy-csv".equals(name) || "bindy-fixed".equals(name) ||
"bindy-kvp".equals(name)) {
+ } else if ("bindyCsv".equals(name) || "bindyFixed".equals(name) ||
"bindyKvp".equals(name)) {
return "bindy";
} else if ("yaml-snakeyaml".equals(name)) {
return "yaml";
@@ -482,11 +482,11 @@ public class PackageDataFormatMojo extends
AbstractGeneratorMojo {
return "JSON XStream";
} else if ("json-fastjson".equals(name)) {
return "JSON Fastjson";
- } else if ("bindy-csv".equals(name)) {
+ } else if ("bindyCsv".equals(name)) {
return "Bindy CSV";
- } else if ("bindy-fixed".equals(name)) {
+ } else if ("bindyFixed".equals(name)) {
return "Bindy Fixed Length";
- } else if ("bindy-kvp".equals(name)) {
+ } else if ("bindyKvp".equals(name)) {
return "Bindy Key Value Pair";
} else if ("yaml-snakeyaml".equals(name)) {
return "YAML SnakeYAML";
