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 c0e0399 CAMEL-17499: Renaming inconsistent data format names in model c0e0399 is described below commit c0e03992592d31c295d4eb8fafc5516246437f3d Author: Claus Ibsen <claus.ib...@gmail.com> AuthorDate: Tue Jan 18 16:18:32 2022 +0100 CAMEL-17499: Renaming inconsistent data format names in model --- .../resources/org/apache/camel/catalog/dataformats.properties | 2 +- .../resources/org/apache/camel/catalog/dataformats/avroJackson.json | 2 +- .../configurer/{avro-jackson-dataformat => avroJackson-dataformat} | 0 .../META-INF/services/org/apache/camel/dataformat.properties | 2 +- .../org/apache/camel/dataformat/{avro-jackson => avroJackson} | 0 .../org/apache/camel/component/jackson/avro/avroJackson.json | 2 +- .../{avro-jackson-dataformat.adoc => avroJackson-dataformat.adoc} | 2 +- .../apache/camel/component/jackson/avro/JacksonAvroDataFormat.java | 4 ++-- .../main/java/org/apache/camel/model/dataformat/AvroLibrary.java | 2 +- .../resources/org/apache/camel/main/dataformats.properties | 2 +- docs/components/modules/dataformats/examples/json/avro-jackson.json | 1 - docs/components/modules/dataformats/examples/json/avroJackson.json | 1 + docs/components/modules/dataformats/nav.adoc | 2 +- .../modules/dataformats/pages/avro-jackson-dataformat.adoc | 1 - .../modules/dataformats/pages/avroJackson-dataformat.adoc | 1 + .../org/apache/camel/maven/packaging/PackageDataFormatMojo.java | 6 +++--- 16 files changed, 15 insertions(+), 15 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 1945cd1..06de992 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 @@ -1,7 +1,7 @@ any23 asn1 avro -avro-jackson +avroJackson barcode base64 beanio diff --git a/components/camel-jackson-avro/src/generated/resources/org/apache/camel/component/jackson/avro/avro-jackson.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/avroJackson.json similarity index 99% rename from components/camel-jackson-avro/src/generated/resources/org/apache/camel/component/jackson/avro/avro-jackson.json rename to catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/avroJackson.json index 6feacf5..9811918 100644 --- a/components/camel-jackson-avro/src/generated/resources/org/apache/camel/component/jackson/avro/avro-jackson.json +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/avroJackson.json @@ -1,7 +1,7 @@ { "dataformat": { "kind": "dataformat", - "name": "avro-jackson", + "name": "avroJackson", "title": "Avro Jackson", "description": "Marshal POJOs to Avro and back using Jackson.", "deprecated": false, diff --git a/components/camel-jackson-avro/src/generated/resources/META-INF/services/org/apache/camel/configurer/avro-jackson-dataformat b/components/camel-jackson-avro/src/generated/resources/META-INF/services/org/apache/camel/configurer/avroJackson-dataformat similarity index 100% rename from components/camel-jackson-avro/src/generated/resources/META-INF/services/org/apache/camel/configurer/avro-jackson-dataformat rename to components/camel-jackson-avro/src/generated/resources/META-INF/services/org/apache/camel/configurer/avroJackson-dataformat diff --git a/components/camel-jackson-avro/src/generated/resources/META-INF/services/org/apache/camel/dataformat.properties b/components/camel-jackson-avro/src/generated/resources/META-INF/services/org/apache/camel/dataformat.properties index c22fed7..39bdd4f 100644 --- a/components/camel-jackson-avro/src/generated/resources/META-INF/services/org/apache/camel/dataformat.properties +++ b/components/camel-jackson-avro/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=avro-jackson +dataFormats=avroJackson groupId=org.apache.camel artifactId=camel-jackson-avro version=3.15.0-SNAPSHOT diff --git a/components/camel-jackson-avro/src/generated/resources/META-INF/services/org/apache/camel/dataformat/avro-jackson b/components/camel-jackson-avro/src/generated/resources/META-INF/services/org/apache/camel/dataformat/avroJackson similarity index 100% rename from components/camel-jackson-avro/src/generated/resources/META-INF/services/org/apache/camel/dataformat/avro-jackson rename to components/camel-jackson-avro/src/generated/resources/META-INF/services/org/apache/camel/dataformat/avroJackson diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/avro-jackson.json b/components/camel-jackson-avro/src/generated/resources/org/apache/camel/component/jackson/avro/avroJackson.json similarity index 99% rename from catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/avro-jackson.json rename to components/camel-jackson-avro/src/generated/resources/org/apache/camel/component/jackson/avro/avroJackson.json index 6feacf5..9811918 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/avro-jackson.json +++ b/components/camel-jackson-avro/src/generated/resources/org/apache/camel/component/jackson/avro/avroJackson.json @@ -1,7 +1,7 @@ { "dataformat": { "kind": "dataformat", - "name": "avro-jackson", + "name": "avroJackson", "title": "Avro Jackson", "description": "Marshal POJOs to Avro and back using Jackson.", "deprecated": false, diff --git a/components/camel-jackson-avro/src/main/docs/avro-jackson-dataformat.adoc b/components/camel-jackson-avro/src/main/docs/avroJackson-dataformat.adoc similarity index 98% rename from components/camel-jackson-avro/src/main/docs/avro-jackson-dataformat.adoc rename to components/camel-jackson-avro/src/main/docs/avroJackson-dataformat.adoc index 1b7555e..43bc4c1 100644 --- a/components/camel-jackson-avro/src/main/docs/avro-jackson-dataformat.adoc +++ b/components/camel-jackson-avro/src/main/docs/avroJackson-dataformat.adoc @@ -1,6 +1,6 @@ = Avro Jackson DataFormat :doctitle: Avro Jackson -:shortname: avro-jackson +:shortname: avroJackson :artifactid: camel-jackson-avro :description: Marshal POJOs to Avro and back using Jackson. :since: 3.10 diff --git a/components/camel-jackson-avro/src/main/java/org/apache/camel/component/jackson/avro/JacksonAvroDataFormat.java b/components/camel-jackson-avro/src/main/java/org/apache/camel/component/jackson/avro/JacksonAvroDataFormat.java index 6e86b81..54bb52c 100644 --- a/components/camel-jackson-avro/src/main/java/org/apache/camel/component/jackson/avro/JacksonAvroDataFormat.java +++ b/components/camel-jackson-avro/src/main/java/org/apache/camel/component/jackson/avro/JacksonAvroDataFormat.java @@ -25,7 +25,7 @@ import org.apache.camel.spi.annotations.Dataformat; /** * Marshal POJOs to Avro and back using Jackson. */ -@Dataformat("avro-jackson") +@Dataformat("avroJackson") @Metadata(firstVersion = "3.10.0", title = "Avro Jackson", excludeProperties = "library,instanceClassName,schema") public class JacksonAvroDataFormat extends AbstractJacksonDataFormat { @@ -77,7 +77,7 @@ public class JacksonAvroDataFormat extends AbstractJacksonDataFormat { @Override public String getDataFormatName() { - return "avro-jackson"; + return "avroJackson"; } @Override diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/AvroLibrary.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/AvroLibrary.java index a019a02..431f7dc 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/AvroLibrary.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/AvroLibrary.java @@ -26,7 +26,7 @@ import javax.xml.bind.annotation.XmlType; @XmlEnum public enum AvroLibrary { ApacheAvro("avro"), - Jackson("avro-jackson"); + Jackson("avroJackson"); private final String dataFormatName; 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 1945cd1..06de992 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 @@ -1,7 +1,7 @@ any23 asn1 avro -avro-jackson +avroJackson barcode base64 beanio diff --git a/docs/components/modules/dataformats/examples/json/avro-jackson.json b/docs/components/modules/dataformats/examples/json/avro-jackson.json deleted file mode 120000 index 8c74199..0000000 --- a/docs/components/modules/dataformats/examples/json/avro-jackson.json +++ /dev/null @@ -1 +0,0 @@ -../../../../../../components/camel-jackson-avro/src/generated/resources/org/apache/camel/component/jackson/avro/avro-jackson.json \ No newline at end of file diff --git a/docs/components/modules/dataformats/examples/json/avroJackson.json b/docs/components/modules/dataformats/examples/json/avroJackson.json new file mode 120000 index 0000000..61627dc --- /dev/null +++ b/docs/components/modules/dataformats/examples/json/avroJackson.json @@ -0,0 +1 @@ +../../../../../../components/camel-jackson-avro/src/generated/resources/org/apache/camel/component/jackson/avro/avroJackson.json \ No newline at end of file diff --git a/docs/components/modules/dataformats/nav.adoc b/docs/components/modules/dataformats/nav.adoc index bbddd33..30dc517 100644 --- a/docs/components/modules/dataformats/nav.adoc +++ b/docs/components/modules/dataformats/nav.adoc @@ -5,7 +5,7 @@ ** xref:any23-dataformat.adoc[Any23] ** xref:asn1-dataformat.adoc[ASN.1 File] ** xref:avro-dataformat.adoc[Avro] -** xref:avro-jackson-dataformat.adoc[Avro Jackson] +** xref:avroJackson-dataformat.adoc[Avro Jackson] ** xref:barcode-dataformat.adoc[Barcode] ** xref:base64-dataformat.adoc[Base64] ** xref:beanio-dataformat.adoc[BeanIO] diff --git a/docs/components/modules/dataformats/pages/avro-jackson-dataformat.adoc b/docs/components/modules/dataformats/pages/avro-jackson-dataformat.adoc deleted file mode 120000 index f4e891c..0000000 --- a/docs/components/modules/dataformats/pages/avro-jackson-dataformat.adoc +++ /dev/null @@ -1 +0,0 @@ -../../../../../components/camel-jackson-avro/src/main/docs/avro-jackson-dataformat.adoc \ No newline at end of file diff --git a/docs/components/modules/dataformats/pages/avroJackson-dataformat.adoc b/docs/components/modules/dataformats/pages/avroJackson-dataformat.adoc new file mode 120000 index 0000000..4e4b477 --- /dev/null +++ b/docs/components/modules/dataformats/pages/avroJackson-dataformat.adoc @@ -0,0 +1 @@ +../../../../../components/camel-jackson-avro/src/main/docs/avroJackson-dataformat.adoc \ No newline at end of file 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 ea17dd9..98957b3 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 @@ -432,7 +432,7 @@ public class PackageDataFormatMojo extends AbstractGeneratorMojo { return "bindy"; } else if ("yaml-snakeyaml".equals(name)) { return "yaml"; - } else if ("avro-jackson".equals(name)) { + } else if ("avroJackson".equals(name)) { return "avro"; } else if ("protobuf-jackson".equals(name)) { return "protobuf"; @@ -454,7 +454,7 @@ public class PackageDataFormatMojo extends AbstractGeneratorMojo { return "2.0.0"; case "json-fastjson": return "2.20.0"; - case "avro-jackson": + case "avroJackson": return "3.10.0"; case "protobuf-jackson": return "3.10.0"; @@ -470,7 +470,7 @@ public class PackageDataFormatMojo extends AbstractGeneratorMojo { return "JSON Gson"; } else if ("json-jackson".equals(name)) { return "JSON Jackson"; - } else if ("avro-jackson".equals(name)) { + } else if ("avroJackson".equals(name)) { return "Avro Jackson"; } else if ("protobuf-jackson".equals(name)) { return "Protobuf Jackson";