CAMEL-17499: Renaming inconsistent data format names in model
diff --git a/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/dataformats.properties b/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/dataformats.properties
index 29c3978..7ba32b4 100644
--- a/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/dataformats.properties
+++ b/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/dataformats.properties
@@ -15,10 +15,10 @@
fhirXml
flatpack
grok
-gzipdeflater
+gzipDeflater
hl7
ical
-jacksonxml
+jacksonXml
jaxb
json-fastjson
json-gson
@@ -28,21 +28,21 @@
json-xstream
jsonApi
lzf
-mime-multipart
+mimeMultipart
pgp
protobuf
protobuf-jackson
rss
-secureXML
-soapjaxb
+soap
syslog
-tarfile
+tarFile
thrift
tidyMarkup
-univocity-csv
-univocity-fixed
-univocity-tsv
+univocityCsv
+univocityFixed
+univocityTsv
+xmlSecurity
xstream
yaml-snakeyaml
-zipdeflater
-zipfile
+zipDeflater
+zipFile
diff --git a/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/dataformats/gzipdeflater.json b/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/dataformats/gzipdeflater.json
index 82703eb..4806a9d 100644
--- a/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/dataformats/gzipdeflater.json
+++ b/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/dataformats/gzipdeflater.json
@@ -1,7 +1,7 @@
{
"dataformat": {
"kind": "dataformat",
- "name": "gzipdeflater",
+ "name": "gzipDeflater",
"title": "GZip Deflater",
"description": "Compress and decompress messages using java.util.zip.GZIPStream.",
"deprecated": false,
@@ -12,8 +12,8 @@
"groupId": "org.apache.camel",
"artifactId": "camel-zip-deflater",
"version": "3.15.0-SNAPSHOT",
- "modelName": "gzipdeflater",
- "modelJavaType": "org.apache.camel.model.dataformat.GzipDataFormat"
+ "modelName": "gzipDeflater",
+ "modelJavaType": "org.apache.camel.model.dataformat.GzipDeflaterDataFormat"
},
"properties": {
"id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The id of this node" }
diff --git a/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/dataformats/jacksonxml.json b/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/dataformats/jacksonxml.json
index 04c073c..bcfd937 100644
--- a/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/dataformats/jacksonxml.json
+++ b/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/dataformats/jacksonxml.json
@@ -1,8 +1,8 @@
{
"dataformat": {
"kind": "dataformat",
- "name": "jacksonxml",
- "title": "JacksonXML",
+ "name": "jacksonXml",
+ "title": "Jackson XML",
"description": "Unmarshal a XML payloads to POJOs and back using XMLMapper extension of Jackson.",
"deprecated": false,
"firstVersion": "2.16.0",
@@ -12,7 +12,7 @@
"groupId": "org.apache.camel",
"artifactId": "camel-jacksonxml",
"version": "3.15.0-SNAPSHOT",
- "modelName": "jacksonxml",
+ "modelName": "jacksonXml",
"modelJavaType": "org.apache.camel.model.dataformat.JacksonXMLDataFormat"
},
"properties": {
diff --git a/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/dataformats/mime-multipart.json b/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/dataformats/mimeMultipart.json
similarity index 97%
rename from catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/dataformats/mime-multipart.json
rename to catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/dataformats/mimeMultipart.json
index 34876d4..ede9fdf 100644
--- a/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/dataformats/mime-multipart.json
+++ b/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/dataformats/mimeMultipart.json
@@ -1,7 +1,7 @@
{
"dataformat": {
"kind": "dataformat",
- "name": "mime-multipart",
+ "name": "mimeMultipart",
"title": "MIME Multipart",
"description": "Marshal Camel messages with attachments into MIME-Multipart messages and back.",
"deprecated": false,
@@ -12,7 +12,7 @@
"groupId": "org.apache.camel",
"artifactId": "camel-mail",
"version": "3.15.0-SNAPSHOT",
- "modelName": "mime-multipart",
+ "modelName": "mimeMultipart",
"modelJavaType": "org.apache.camel.model.dataformat.MimeMultipartDataFormat"
},
"properties": {
diff --git a/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/dataformats/soapjaxb.json b/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/dataformats/soap.json
similarity index 88%
rename from catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/dataformats/soapjaxb.json
rename to catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/dataformats/soap.json
index 2c4d438..17d7ca1 100644
--- a/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/dataformats/soapjaxb.json
+++ b/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/dataformats/soap.json
@@ -1,25 +1,25 @@
{
"dataformat": {
"kind": "dataformat",
- "name": "soapjaxb",
+ "name": "soap",
"title": "SOAP",
"description": "Marshal Java objects to SOAP messages and back.",
"deprecated": false,
"firstVersion": "2.3.0",
"label": "dataformat,transformation,xml",
- "javaType": "org.apache.camel.dataformat.soap.SoapJaxbDataFormat",
+ "javaType": "org.apache.camel.dataformat.soap.SoapDataFormat",
"supportLevel": "Stable",
"groupId": "org.apache.camel",
"artifactId": "camel-soap",
"version": "3.15.0-SNAPSHOT",
- "modelName": "soapjaxb",
- "modelJavaType": "org.apache.camel.model.dataformat.SoapJaxbDataFormat"
+ "modelName": "soap",
+ "modelJavaType": "org.apache.camel.model.dataformat.SoapDataFormat"
},
"properties": {
"contextPath": { "kind": "attribute", "displayName": "Context Path", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Package name where your JAXB classes are located." },
"encoding": { "kind": "attribute", "displayName": "Encoding", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "To overrule and use a specific encoding" },
"elementNameStrategyRef": { "kind": "attribute", "displayName": "Element Name Strategy Ref", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Refers to an element strategy to lookup from the registry. An element name strategy is used for two purposes. The first is to find a xml element name for a given object and soap action when marshaling the object into a SOAP message. The second is to find an Exception class for a given soap fault name. The following three element strategy class name is provided out of the box. QNameStrategy - Uses a fixed qName that is configured on instantiation. Exception lookup is not supported TypeNameStrategy - Uses the name and namespace from the XMLType annotation of the given type. If no namespace is set then package-info is used. Exception lookup is not supported ServiceInterfaceStrategy - Uses information from a webservice interface to determine the type name and to find the exception class for a SOAP fault All three classes is located in the package name org.apache.camel.dataformat.soap.name If you have generated the web service stub code with cxf-codegen or a similar tool then you probably will want to use the ServiceInterfaceStrategy. In the case you have no annotated service interface you should use QNameStrategy or TypeNameStrategy." },
- "version": { "kind": "attribute", "displayName": "Version", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "1.1", "description": "SOAP version should either be 1.1 or 1.2. Is by default 1.1" },
+ "version": { "kind": "attribute", "displayName": "Version", "required": false, "type": "enum", "javaType": "java.lang.String", "enum": [ "1.1", "1.2" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "1.1", "description": "SOAP version should either be 1.1 or 1.2. Is by default 1.1" },
"namespacePrefixRef": { "kind": "attribute", "displayName": "Namespace Prefix Ref", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "When marshalling using JAXB or SOAP then the JAXB implementation will automatic assign namespace prefixes, such as ns2, ns3, ns4 etc. To control this mapping, Camel allows you to refer to a map which contains the desired mapping." },
"schema": { "kind": "attribute", "displayName": "Schema", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "To validate against an existing schema. Your can use the prefix classpath:, file: or http: to specify how the resource should by resolved. You can separate multiple schema files by using the ',' character." },
"id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The id of this node" }
diff --git a/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/dataformats/tarfile.json b/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/dataformats/tarfile.json
index ee4a360..c8593cb 100644
--- a/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/dataformats/tarfile.json
+++ b/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/dataformats/tarfile.json
@@ -1,7 +1,7 @@
{
"dataformat": {
"kind": "dataformat",
- "name": "tarfile",
+ "name": "tarFile",
"title": "Tar File",
"description": "Archive files into tarballs or extract files from tarballs.",
"deprecated": false,
@@ -12,7 +12,7 @@
"groupId": "org.apache.camel",
"artifactId": "camel-tarfile",
"version": "3.15.0-SNAPSHOT",
- "modelName": "tarfile",
+ "modelName": "tarFile",
"modelJavaType": "org.apache.camel.model.dataformat.TarFileDataFormat"
},
"properties": {
diff --git a/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/dataformats/univocity-csv.json b/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/dataformats/univocityCsv.json
similarity index 98%
rename from catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/dataformats/univocity-csv.json
rename to catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/dataformats/univocityCsv.json
index 52944a3..e6ef784 100644
--- a/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/dataformats/univocity-csv.json
+++ b/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/dataformats/univocityCsv.json
@@ -1,7 +1,7 @@
{
"dataformat": {
"kind": "dataformat",
- "name": "univocity-csv",
+ "name": "univocityCsv",
"title": "uniVocity CSV",
"description": "Marshal and unmarshal Java objects from and to CSV (Comma Separated Values) using UniVocity Parsers.",
"deprecated": false,
@@ -12,7 +12,7 @@
"groupId": "org.apache.camel",
"artifactId": "camel-univocity-parsers",
"version": "3.15.0-SNAPSHOT",
- "modelName": "univocity-csv",
+ "modelName": "univocityCsv",
"modelJavaType": "org.apache.camel.model.dataformat.UniVocityCsvDataFormat"
},
"properties": {
diff --git a/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/dataformats/univocity-fixed.json b/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/dataformats/univocityFixed.json
similarity index 97%
rename from catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/dataformats/univocity-fixed.json
rename to catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/dataformats/univocityFixed.json
index 5426d30..3b5772a 100644
--- a/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/dataformats/univocity-fixed.json
+++ b/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/dataformats/univocityFixed.json
@@ -1,19 +1,19 @@
{
"dataformat": {
"kind": "dataformat",
- "name": "univocity-fixed",
+ "name": "univocityFixed",
"title": "uniVocity Fixed Length",
"description": "Marshal and unmarshal Java objects from and to fixed length records using UniVocity Parsers.",
"deprecated": false,
"firstVersion": "2.15.0",
"label": "dataformat,transformation,csv",
- "javaType": "org.apache.camel.dataformat.univocity.UniVocityFixedWidthDataFormat",
+ "javaType": "org.apache.camel.dataformat.univocity.UniVocityFixedDataFormat",
"supportLevel": "Stable",
"groupId": "org.apache.camel",
"artifactId": "camel-univocity-parsers",
"version": "3.15.0-SNAPSHOT",
- "modelName": "univocity-fixed",
- "modelJavaType": "org.apache.camel.model.dataformat.UniVocityFixedWidthDataFormat"
+ "modelName": "univocityFixed",
+ "modelJavaType": "org.apache.camel.model.dataformat.UniVocityFixedDataFormat"
},
"properties": {
"skipTrailingCharsUntilNewline": { "kind": "attribute", "displayName": "Skip Trailing Chars Until Newline", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether or not the trailing characters until new line must be ignored. The default value is false" },
diff --git a/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/dataformats/univocity-tsv.json b/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/dataformats/univocityTsv.json
similarity index 98%
rename from catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/dataformats/univocity-tsv.json
rename to catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/dataformats/univocityTsv.json
index 51c8a2e..e2d10a3 100644
--- a/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/dataformats/univocity-tsv.json
+++ b/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/dataformats/univocityTsv.json
@@ -1,7 +1,7 @@
{
"dataformat": {
"kind": "dataformat",
- "name": "univocity-tsv",
+ "name": "univocityTsv",
"title": "uniVocity TSV",
"description": "Marshal and unmarshal Java objects from and to TSV (Tab-Separated Values) records using UniVocity Parsers.",
"deprecated": false,
@@ -12,7 +12,7 @@
"groupId": "org.apache.camel",
"artifactId": "camel-univocity-parsers",
"version": "3.15.0-SNAPSHOT",
- "modelName": "univocity-tsv",
+ "modelName": "univocityTsv",
"modelJavaType": "org.apache.camel.model.dataformat.UniVocityTsvDataFormat"
},
"properties": {
diff --git a/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/dataformats/secureXML.json b/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/dataformats/xmlSecurity.json
similarity index 97%
rename from catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/dataformats/secureXML.json
rename to catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/dataformats/xmlSecurity.json
index 5dda07b..938c991 100644
--- a/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/dataformats/secureXML.json
+++ b/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/dataformats/xmlSecurity.json
@@ -1,18 +1,18 @@
{
"dataformat": {
"kind": "dataformat",
- "name": "secureXML",
+ "name": "xmlSecurity",
"title": "XML Security",
"description": "Encrypt and decrypt XML payloads using Apache Santuario.",
"deprecated": false,
"firstVersion": "2.0.0",
- "label": "dataformat,transformation,xml,security",
+ "label": "dataformat,transformation,xml",
"javaType": "org.apache.camel.dataformat.xmlsecurity.XMLSecurityDataFormat",
"supportLevel": "Stable",
"groupId": "org.apache.camel",
"artifactId": "camel-xmlsecurity",
"version": "3.15.0-SNAPSHOT",
- "modelName": "secureXML",
+ "modelName": "xmlSecurity",
"modelJavaType": "org.apache.camel.model.dataformat.XMLSecurityDataFormat"
},
"properties": {
diff --git a/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/dataformats/zipdeflater.json b/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/dataformats/zipdeflater.json
index 4b9f4b3..040b7a3 100644
--- a/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/dataformats/zipdeflater.json
+++ b/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/dataformats/zipdeflater.json
@@ -1,8 +1,8 @@
{
"dataformat": {
"kind": "dataformat",
- "name": "zipdeflater",
- "title": "Zip Deflate Compression",
+ "name": "zipDeflater",
+ "title": "Zip Deflater",
"description": "Compress and decompress streams using java.util.zip.Deflater and java.util.zip.Inflater.",
"deprecated": false,
"firstVersion": "2.12.0",
@@ -12,11 +12,11 @@
"groupId": "org.apache.camel",
"artifactId": "camel-zip-deflater",
"version": "3.15.0-SNAPSHOT",
- "modelName": "zipdeflater",
+ "modelName": "zipDeflater",
"modelJavaType": "org.apache.camel.model.dataformat.ZipDeflaterDataFormat"
},
"properties": {
- "compressionLevel": { "kind": "attribute", "displayName": "Compression Level", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "-1", "description": "To specify a specific compression between 0-9. -1 is default compression, 0 is no compression, and 9 is best compression." },
+ "compressionLevel": { "kind": "attribute", "displayName": "Compression Level", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "-1", "description": "To specify a specific compression between 0-9. -1 is default compression, 0 is no compression, and 9 is the best compression." },
"id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The id of this node" }
}
}
diff --git a/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/dataformats/zipfile.json b/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/dataformats/zipfile.json
index cb4cc16..894fbb0 100644
--- a/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/dataformats/zipfile.json
+++ b/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/dataformats/zipfile.json
@@ -1,7 +1,7 @@
{
"dataformat": {
"kind": "dataformat",
- "name": "zipfile",
+ "name": "zipFile",
"title": "Zip File",
"description": "Compression and decompress streams using java.util.zip.ZipStream.",
"deprecated": false,
@@ -12,7 +12,7 @@
"groupId": "org.apache.camel",
"artifactId": "camel-zipfile",
"version": "3.15.0-SNAPSHOT",
- "modelName": "zipfile",
+ "modelName": "zipFile",
"modelJavaType": "org.apache.camel.model.dataformat.ZipFileDataFormat"
},
"properties": {
diff --git a/catalog/camel-catalog-provider-karaf/src/test/java/org/apache/camel/catalog/karaf/KarafRuntimeProviderTest.java b/catalog/camel-catalog-provider-karaf/src/test/java/org/apache/camel/catalog/karaf/KarafRuntimeProviderTest.java
index 02295ab..1f38cc5 100644
--- a/catalog/camel-catalog-provider-karaf/src/test/java/org/apache/camel/catalog/karaf/KarafRuntimeProviderTest.java
+++ b/catalog/camel-catalog-provider-karaf/src/test/java/org/apache/camel/catalog/karaf/KarafRuntimeProviderTest.java
@@ -90,8 +90,8 @@
assertFalse(names.isEmpty());
assertTrue(names.contains("bindy-csv"));
- assertTrue(names.contains("zipdeflater"));
- assertTrue(names.contains("zipfile"));
+ assertTrue(names.contains("zipDeflater"));
+ assertTrue(names.contains("zipFile"));
}
@Test
