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 2023/02/05 11:12:15 UTC
[camel] branch main updated: CAMEL-19009: camel-gson - Date Format with GsonBuilder
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 b6f165dbc63 CAMEL-19009: camel-gson - Date Format with GsonBuilder
b6f165dbc63 is described below
commit b6f165dbc63ce2b8a2a2ab935af169f27d6cd8dd
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Sun Feb 5 12:11:40 2023 +0100
CAMEL-19009: camel-gson - Date Format with GsonBuilder
---
.../java/org/apache/camel/component/jackson/JacksonDataFormat.java | 2 +-
.../org/apache/camel/reifier/dataformat/JsonDataFormatReifier.java | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/components/camel-jackson/src/main/java/org/apache/camel/component/jackson/JacksonDataFormat.java b/components/camel-jackson/src/main/java/org/apache/camel/component/jackson/JacksonDataFormat.java
index d4243c5751e..4666c9b1957 100644
--- a/components/camel-jackson/src/main/java/org/apache/camel/component/jackson/JacksonDataFormat.java
+++ b/components/camel-jackson/src/main/java/org/apache/camel/component/jackson/JacksonDataFormat.java
@@ -24,7 +24,7 @@ import org.apache.camel.spi.annotations.Dataformat;
* Marshal POJOs to JSON and back using Jackson.
*/
@Dataformat("jackson")
-@Metadata(excludeProperties = "library,permissions")
+@Metadata(excludeProperties = "library,permissions,dateFormatPattern")
public class JacksonDataFormat extends AbstractJacksonDataFormat {
/**
diff --git a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/JsonDataFormatReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/JsonDataFormatReifier.java
index f6dd3c68a38..891a770a574 100644
--- a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/JsonDataFormatReifier.java
+++ b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/JsonDataFormatReifier.java
@@ -46,7 +46,6 @@ public class JsonDataFormatReifier extends DataFormatReifier<JsonDataFormat> {
}
properties.put("unmarshalType", or(definition.getUnmarshalType(), definition.getUnmarshalTypeName()));
properties.put("prettyPrint", definition.getPrettyPrint());
- properties.put("dateFormatPattern", definition.getDateFormatPattern());
properties.put("include", definition.getInclude());
properties.put("allowJmsType", definition.getAllowJmsType());
properties.put("collectionType", or(definition.getCollectionType(), definition.getCollectionTypeName()));
@@ -62,6 +61,9 @@ public class JsonDataFormatReifier extends DataFormatReifier<JsonDataFormat> {
properties.put("namingStrategy", definition.getNamingStrategy());
properties.put("timezone", definition.getTimezone());
}
+ if (definition.getLibrary() == JsonLibrary.Fastjson || definition.getLibrary() == JsonLibrary.Gson) {
+ properties.put("dateFormatPattern", definition.getDateFormatPattern());
+ }
}
}