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 2020/10/15 10:51:47 UTC
[camel] branch master updated: [CAMEL-15691] ensure johnzon format
doc does not inherit inaccurate jackson doc (#4451)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 12b6945 [CAMEL-15691] ensure johnzon format doc does not inherit inaccurate jackson doc (#4451)
12b6945 is described below
commit 12b694525a1695e481908ab9f678431f44522312
Author: Romain Manni-Bucau <rm...@gmail.com>
AuthorDate: Thu Oct 15 12:51:31 2020 +0200
[CAMEL-15691] ensure johnzon format doc does not inherit inaccurate jackson doc (#4451)
---
.../org/apache/camel/catalog/docs/json-johnzon-dataformat.adoc | 2 +-
.../resources/org/apache/camel/component/johnzon/json-johnzon.json | 2 +-
components/camel-johnzon/src/main/docs/json-johnzon-dataformat.adoc | 2 +-
.../components/modules/dataformats/pages/json-johnzon-dataformat.adoc | 2 +-
.../java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java | 4 ++++
5 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/json-johnzon-dataformat.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/json-johnzon-dataformat.adoc
index 32573f7..0c2f82e 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/json-johnzon-dataformat.adoc
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/json-johnzon-dataformat.adoc
@@ -31,7 +31,7 @@ The JSON Johnzon dataformat supports 3 options, which are listed below.
[width="100%",cols="2s,1m,1m,6",options="header"]
|===
| Name | Default | Java Type | Description
-| objectMapper | | String | Lookup and use the existing ObjectMapper with the given id when using Jackson.
+| objectMapper | | String | Lookup and use the existing Mapper with the given id.
| prettyPrint | false | Boolean | To enable pretty printing output nicely formatted. Is by default false.
| unmarshalTypeName | | String | Class name of the java type to use when unmarshalling
|===
diff --git a/components/camel-johnzon/src/generated/resources/org/apache/camel/component/johnzon/json-johnzon.json b/components/camel-johnzon/src/generated/resources/org/apache/camel/component/johnzon/json-johnzon.json
index 4283ce8..f4c9546 100644
--- a/components/camel-johnzon/src/generated/resources/org/apache/camel/component/johnzon/json-johnzon.json
+++ b/components/camel-johnzon/src/generated/resources/org/apache/camel/component/johnzon/json-johnzon.json
@@ -16,7 +16,7 @@
"modelJavaType": "org.apache.camel.model.dataformat.JsonDataFormat"
},
"properties": {
- "objectMapper": { "kind": "attribute", "displayName": "Object Mapper", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Lookup and use the existing ObjectMapper with the given id when using Jackson." },
+ "objectMapper": { "kind": "attribute", "displayName": "Mapper", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Lookup and use the existing Mapper with the given id." },
"prettyPrint": { "kind": "attribute", "displayName": "Pretty Print", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "To enable pretty printing output nicely formatted. Is by default false." },
"unmarshalTypeName": { "kind": "attribute", "displayName": "Unmarshal Type Name", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Class name of the java type to use when unmarshalling" }
}
diff --git a/components/camel-johnzon/src/main/docs/json-johnzon-dataformat.adoc b/components/camel-johnzon/src/main/docs/json-johnzon-dataformat.adoc
index 32573f7..0c2f82e 100644
--- a/components/camel-johnzon/src/main/docs/json-johnzon-dataformat.adoc
+++ b/components/camel-johnzon/src/main/docs/json-johnzon-dataformat.adoc
@@ -31,7 +31,7 @@ The JSON Johnzon dataformat supports 3 options, which are listed below.
[width="100%",cols="2s,1m,1m,6",options="header"]
|===
| Name | Default | Java Type | Description
-| objectMapper | | String | Lookup and use the existing ObjectMapper with the given id when using Jackson.
+| objectMapper | | String | Lookup and use the existing Mapper with the given id.
| prettyPrint | false | Boolean | To enable pretty printing output nicely formatted. Is by default false.
| unmarshalTypeName | | String | Class name of the java type to use when unmarshalling
|===
diff --git a/docs/components/modules/dataformats/pages/json-johnzon-dataformat.adoc b/docs/components/modules/dataformats/pages/json-johnzon-dataformat.adoc
index 24c5675..590ba43 100644
--- a/docs/components/modules/dataformats/pages/json-johnzon-dataformat.adoc
+++ b/docs/components/modules/dataformats/pages/json-johnzon-dataformat.adoc
@@ -33,7 +33,7 @@ The JSON Johnzon dataformat supports 3 options, which are listed below.
[width="100%",cols="2s,1m,1m,6",options="header"]
|===
| Name | Default | Java Type | Description
-| objectMapper | | String | Lookup and use the existing ObjectMapper with the given id when using Jackson.
+| objectMapper | | String | Lookup and use the existing Mapper with the given id.
| prettyPrint | false | Boolean | To enable pretty printing output nicely formatted. Is by default false.
| unmarshalTypeName | | String | Class name of the java type to use when unmarshalling
|===
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 5f2f674..aff0d04 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
@@ -355,6 +355,10 @@ public class PackageDataFormatMojo extends AbstractGeneratorMojo {
}
}
+ if ("objectMapper".equals(option.getName()) && "json-johnzon".equals(name)) {
+ option.setDisplayName("Mapper");
+ option.setDescription("Lookup and use the existing Mapper with the given id.");
+ }
if ("library".equals(option.getName()) && "json".equals(model.getModelName())) {
switch (name) {
case "json-gson":