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-karaf.git
The following commit(s) were added to refs/heads/main by this push:
new 352fe69 CAMEL-17499: Renaming inconsistent data format names in model
352fe69 is described below
commit 352fe694aabded7ededa337eda3f764e48227d84
Author: Claus Ibsen <[email protected]>
AuthorDate: Wed Jan 19 15:53:31 2022 +0100
CAMEL-17499: Renaming inconsistent data format names in model
---
.../org/apache/camel/catalog/karaf/dataformats.properties | 12 ++++++------
.../karaf/dataformats/{json-fastjson.json => fastjson.json} | 2 +-
.../catalog/karaf/dataformats/{json-gson.json => gson.json} | 2 +-
.../karaf/dataformats/{json-jackson.json => jackson.json} | 2 +-
.../karaf/dataformats/{json-johnzon.json => johnzon.json} | 2 +-
.../karaf/dataformats/{json-jsonb.json => jsonb.json} | 2 +-
.../dataformats/{json-xstream.json => xstreamJson.json} | 2 +-
7 files changed, 12 insertions(+), 12 deletions(-)
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 c44839b..0f43262 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
@@ -11,22 +11,21 @@ bindyKvp
cbor
crypto
csv
+fastjson
fhirJson
fhirXml
flatpack
grok
+gson
gzipDeflater
hl7
ical
+jackson
jacksonXml
jaxb
-json-fastjson
-json-gson
-json-jackson
-json-johnzon
-json-jsonb
-json-xstream
+johnzon
jsonApi
+jsonb
lzf
mimeMultipart
pgp
@@ -44,5 +43,6 @@ univocityFixed
univocityTsv
xmlSecurity
xstream
+xstreamJson
zipDeflater
zipFile
diff --git
a/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/dataformats/json-fastjson.json
b/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/dataformats/fastjson.json
similarity index 97%
rename from
catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/dataformats/json-fastjson.json
rename to
catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/dataformats/fastjson.json
index 49972fb..607124d 100644
---
a/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/dataformats/json-fastjson.json
+++
b/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/dataformats/fastjson.json
@@ -1,7 +1,7 @@
{
"dataformat": {
"kind": "dataformat",
- "name": "json-fastjson",
+ "name": "fastjson",
"title": "JSON Fastjson",
"description": "Marshal POJOs to JSON and back using Fastjson",
"deprecated": false,
diff --git
a/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/dataformats/json-gson.json
b/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/dataformats/gson.json
similarity index 98%
rename from
catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/dataformats/json-gson.json
rename to
catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/dataformats/gson.json
index 0c18eac..a48e12d 100644
---
a/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/dataformats/json-gson.json
+++
b/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/dataformats/gson.json
@@ -1,7 +1,7 @@
{
"dataformat": {
"kind": "dataformat",
- "name": "json-gson",
+ "name": "gson",
"title": "JSON Gson",
"description": "Marshal POJOs to JSON and back using Gson",
"deprecated": false,
diff --git
a/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/dataformats/json-jackson.json
b/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/dataformats/jackson.json
similarity index 99%
rename from
catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/dataformats/json-jackson.json
rename to
catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/dataformats/jackson.json
index 2cfe4b0..7809253 100644
---
a/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/dataformats/json-jackson.json
+++
b/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/dataformats/jackson.json
@@ -1,7 +1,7 @@
{
"dataformat": {
"kind": "dataformat",
- "name": "json-jackson",
+ "name": "jackson",
"title": "JSON Jackson",
"description": "Marshal POJOs to JSON and back using Jackson",
"deprecated": false,
diff --git
a/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/dataformats/json-johnzon.json
b/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/dataformats/johnzon.json
similarity index 98%
rename from
catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/dataformats/json-johnzon.json
rename to
catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/dataformats/johnzon.json
index b8206e5..3dd124c 100644
---
a/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/dataformats/json-johnzon.json
+++
b/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/dataformats/johnzon.json
@@ -1,7 +1,7 @@
{
"dataformat": {
"kind": "dataformat",
- "name": "json-johnzon",
+ "name": "johnzon",
"title": "JSON Johnzon",
"description": "Marshal POJOs to JSON and back using Johnzon",
"deprecated": false,
diff --git
a/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/dataformats/json-jsonb.json
b/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/dataformats/jsonb.json
similarity index 98%
rename from
catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/dataformats/json-jsonb.json
rename to
catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/dataformats/jsonb.json
index 2e10d67..6330714 100644
---
a/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/dataformats/json-jsonb.json
+++
b/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/dataformats/jsonb.json
@@ -1,7 +1,7 @@
{
"dataformat": {
"kind": "dataformat",
- "name": "json-jsonb",
+ "name": "jsonb",
"title": "JSON JSON-B",
"description": "Marshal POJOs to JSON and back using JSON-B.",
"deprecated": false,
diff --git
a/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/dataformats/json-xstream.json
b/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/dataformats/xstreamJson.json
similarity index 98%
rename from
catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/dataformats/json-xstream.json
rename to
catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/dataformats/xstreamJson.json
index c73e3d4..c894199 100644
---
a/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/dataformats/json-xstream.json
+++
b/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/dataformats/xstreamJson.json
@@ -1,7 +1,7 @@
{
"dataformat": {
"kind": "dataformat",
- "name": "json-xstream",
+ "name": "xstreamJson",
"title": "JSON XStream",
"description": "Marshal POJOs to JSON and back using XStream",
"deprecated": false,
