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/03 08:02:08 UTC

[camel-spring-boot] branch main updated: Remove some of the xstream leftovers in json data formats

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-spring-boot.git


The following commit(s) were added to refs/heads/main by this push:
     new d61bda9bf69 Remove some of the xstream leftovers in json data formats
d61bda9bf69 is described below

commit d61bda9bf6919065e7c71a410ca510d12b81fb6e
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri Feb 3 09:02:00 2023 +0100

    Remove some of the xstream leftovers in json data formats
---
 .../org/apache/camel/springboot/catalog/dataformats/jackson.json    | 4 ++--
 components-starter/camel-jackson-starter/src/main/docs/jackson.json | 2 +-
 .../jackson/springboot/JacksonDataFormatConfiguration.java          | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/jackson.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/jackson.json
index 18f9f96799c..a2fa508437a 100644
--- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/jackson.json
+++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/jackson.json
@@ -3,7 +3,7 @@
     "kind": "dataformat",
     "name": "jackson",
     "title": "JSON Jackson",
-    "description": "Marshal POJOs to JSON and back using Jackson",
+    "description": "Marshal POJOs to JSON and back using Jackson.",
     "deprecated": false,
     "firstVersion": "2.0.0",
     "label": "dataformat,transformation,json",
@@ -31,7 +31,7 @@
     "enableFeatures": { "kind": "attribute", "displayName": "Enable Features", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Set of features to enable on the Jackson com.fasterxml.jackson.databind.ObjectMapper. The features should be a name that matches a enum from com.fasterxml.jackson.databind.SerializationFeature, com.fasterxml.jackson.databind.DeserializationFeature,  [...]
     "disableFeatures": { "kind": "attribute", "displayName": "Disable Features", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Set of features to disable on the Jackson com.fasterxml.jackson.databind.ObjectMapper. The features should be a name that matches a enum from com.fasterxml.jackson.databind.SerializationFeature, com.fasterxml.jackson.databind.DeserializationFeatur [...]
     "allowUnmarshallType": { "kind": "attribute", "displayName": "Allow Unmarshall Type", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "If enabled then Jackson is allowed to attempt to use the CamelJacksonUnmarshalType header during the unmarshalling. This should only be enabled when desired to be used." },
-    "timezone": { "kind": "attribute", "displayName": "Timezone", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "If set then Jackson will use the Timezone when marshalling\/unmarshalling. This option will have no effect on the others Json DataFormat, like gson, fastjson and xstream." },
+    "timezone": { "kind": "attribute", "displayName": "Timezone", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "If set then Jackson will use the Timezone when marshalling\/unmarshalling. This option will have no effect on the others Json DataFormat, like gson and fastjson." },
     "schemaResolver": { "kind": "attribute", "displayName": "Schema Resolver", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Optional schema resolver used to lookup schemas for the data in transit." },
     "autoDiscoverSchemaResolver": { "kind": "attribute", "displayName": "Auto Discover Schema Resolver", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "When not disabled, the SchemaResolver will be looked up into the registry" },
     "namingStrategy": { "kind": "attribute", "displayName": "Naming Strategy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "If set then Jackson will use the the defined Property Naming Strategy.Possible values are: LOWER_CAMEL_CASE, LOWER_DOT_CASE, LOWER_CASE, KEBAB_CASE, SNAKE_CASE and UPPER_CAMEL_CASE" },
diff --git a/components-starter/camel-jackson-starter/src/main/docs/jackson.json b/components-starter/camel-jackson-starter/src/main/docs/jackson.json
index 5fe635539a8..f9243179118 100644
--- a/components-starter/camel-jackson-starter/src/main/docs/jackson.json
+++ b/components-starter/camel-jackson-starter/src/main/docs/jackson.json
@@ -129,7 +129,7 @@
     {
       "name": "camel.dataformat.jackson.timezone",
       "type": "java.lang.String",
-      "description": "If set then Jackson will use the Timezone when marshalling\/unmarshalling. This option will have no effect on the others Json DataFormat, like gson, fastjson and xstream.",
+      "description": "If set then Jackson will use the Timezone when marshalling\/unmarshalling. This option will have no effect on the others Json DataFormat, like gson and fastjson.",
       "sourceType": "org.apache.camel.component.jackson.springboot.JacksonDataFormatConfiguration"
     },
     {
diff --git a/components-starter/camel-jackson-starter/src/main/java/org/apache/camel/component/jackson/springboot/JacksonDataFormatConfiguration.java b/components-starter/camel-jackson-starter/src/main/java/org/apache/camel/component/jackson/springboot/JacksonDataFormatConfiguration.java
index d89e6d96746..89627f06551 100644
--- a/components-starter/camel-jackson-starter/src/main/java/org/apache/camel/component/jackson/springboot/JacksonDataFormatConfiguration.java
+++ b/components-starter/camel-jackson-starter/src/main/java/org/apache/camel/component/jackson/springboot/JacksonDataFormatConfiguration.java
@@ -20,7 +20,7 @@ import org.apache.camel.spring.boot.DataFormatConfigurationPropertiesCommon;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
 /**
- * Marshal POJOs to JSON and back using Jackson
+ * Marshal POJOs to JSON and back using Jackson.
  * 
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
@@ -122,8 +122,8 @@ public class JacksonDataFormatConfiguration
     private Boolean allowUnmarshallType = false;
     /**
      * If set then Jackson will use the Timezone when marshalling/unmarshalling.
-     * This option will have no effect on the others Json DataFormat, like gson,
-     * fastjson and xstream.
+     * This option will have no effect on the others Json DataFormat, like gson
+     * and fastjson.
      */
     private String timezone;
     /**