This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch j3 in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit 7f3a468ad4f1a146acafbf6884f6b1ae95abdf97 Author: Claus Ibsen <[email protected]> AuthorDate: Thu Mar 5 14:51:13 2026 +0100 CAMEL-22857: Add jackson3 CSB starter --- .../springboot/catalog/dataformats/jackson.json | 8 +- .../catalog/transformers/application-json.json | 6 +- .../transformers/application-x-java-object.json | 4 +- .../catalog/transformers/application-x-struct.json | 6 +- components-starter/camel-jackson3-starter/pom.xml | 48 +++ .../src/main/docs/jackson3.json | 173 +++++++++++ .../JacksonDataFormatAutoConfiguration.java | 78 +++++ .../springboot/JacksonDataFormatConfiguration.java | 342 +++++++++++++++++++++ .../springboot/JacksonDataFormatConverter.java | 64 ++++ .../src/main/resources/META-INF/LICENSE.txt | 203 ++++++++++++ .../src/main/resources/META-INF/NOTICE.txt | 11 + ...rk.boot.autoconfigure.AutoConfiguration.imports | 17 + components-starter/pom.xml | 1 + tooling/camel-spring-boot-bom/pom.xml | 5 + tooling/camel-spring-boot-dependencies/pom.xml | 5 + .../maven/SpringBootAutoConfigurationMojo.java | 17 +- 16 files changed, 972 insertions(+), 16 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 08584e5a337..2f5959c9f4f 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 @@ -5,12 +5,12 @@ "title": "JSON Jackson", "description": "Marshal POJOs to JSON and back using Jackson.", "deprecated": false, - "firstVersion": "2.0.0", + "firstVersion": "4.19.0", "label": "dataformat,transformation,json", - "javaType": "org.apache.camel.component.jackson.JacksonDataFormat", - "supportLevel": "Stable", + "javaType": "org.apache.camel.component.jackson3.JacksonDataFormat", + "supportLevel": "Preview", "groupId": "org.apache.camel.springboot", - "artifactId": "camel-jackson-starter", + "artifactId": "camel-jackson3-starter", "version": "4.19.0-SNAPSHOT", "modelName": "json", "modelJavaType": "org.apache.camel.model.dataformat.JsonDataFormat" diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/transformers/application-json.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/transformers/application-json.json index 11886b32c78..59165a3c129 100644 --- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/transformers/application-json.json +++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/transformers/application-json.json @@ -3,11 +3,11 @@ "kind": "transformer", "name": "application-json", "title": "Application Json", - "description": "Transforms from JSon to binary (byte array) using Jackson", + "description": "Transforms from JSon to binary (byte array) using Jackson 3", "deprecated": false, - "javaType": "org.apache.camel.component.jackson.transform.JsonDataTypeTransformer", + "javaType": "org.apache.camel.component.jackson3.transform.JsonDataTypeTransformer", "groupId": "org.apache.camel.springboot", - "artifactId": "camel-jackson-starter", + "artifactId": "camel-jackson3-starter", "version": "4.19.0-SNAPSHOT" } } diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/transformers/application-x-java-object.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/transformers/application-x-java-object.json index da80b9b9fbd..ce73ec8a053 100644 --- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/transformers/application-x-java-object.json +++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/transformers/application-x-java-object.json @@ -5,9 +5,9 @@ "title": "Application X Java Object", "description": "Transforms from JSon to Java object using Jackson (supports content schema)", "deprecated": false, - "javaType": "org.apache.camel.component.jackson.transform.JsonPojoDataTypeTransformer", + "javaType": "org.apache.camel.component.jackson3.transform.JsonPojoDataTypeTransformer", "groupId": "org.apache.camel.springboot", - "artifactId": "camel-jackson-starter", + "artifactId": "camel-jackson3-starter", "version": "4.19.0-SNAPSHOT" } } diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/transformers/application-x-struct.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/transformers/application-x-struct.json index 57290d04a40..65fb86decf0 100644 --- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/transformers/application-x-struct.json +++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/transformers/application-x-struct.json @@ -3,11 +3,11 @@ "kind": "transformer", "name": "application-x-struct", "title": "Application X Struct", - "description": "Transforms to generic JSonNode using Jackson", + "description": "Transforms to generic JSonNode using Jackson 3", "deprecated": false, - "javaType": "org.apache.camel.component.jackson.transform.JsonStructDataTypeTransformer", + "javaType": "org.apache.camel.component.jackson3.transform.JsonStructDataTypeTransformer", "groupId": "org.apache.camel.springboot", - "artifactId": "camel-jackson-starter", + "artifactId": "camel-jackson3-starter", "version": "4.19.0-SNAPSHOT" } } diff --git a/components-starter/camel-jackson3-starter/pom.xml b/components-starter/camel-jackson3-starter/pom.xml new file mode 100644 index 00000000000..9a362a7f0a2 --- /dev/null +++ b/components-starter/camel-jackson3-starter/pom.xml @@ -0,0 +1,48 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +--> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.camel.springboot</groupId> + <artifactId>components-starter</artifactId> + <version>4.19.0-SNAPSHOT</version> + </parent> + <artifactId>camel-jackson3-starter</artifactId> + <packaging>jar</packaging> + <name>Camel SB Starters :: jackson3</name> + <dependencies> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter</artifactId> + <version>${spring-boot-version}</version> + </dependency> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-jackson3</artifactId> + <version>${camel-version}</version> + </dependency> + <!--START OF GENERATED CODE--> + <dependency> + <groupId>org.apache.camel.springboot</groupId> + <artifactId>camel-core-starter</artifactId> + </dependency> + <!--END OF GENERATED CODE--> + </dependencies> +</project> diff --git a/components-starter/camel-jackson3-starter/src/main/docs/jackson3.json b/components-starter/camel-jackson3-starter/src/main/docs/jackson3.json new file mode 100644 index 00000000000..718a94741ae --- /dev/null +++ b/components-starter/camel-jackson3-starter/src/main/docs/jackson3.json @@ -0,0 +1,173 @@ +{ + "groups": [ + { + "name": "camel.dataformat.jackson", + "type": "org.apache.camel.component.jackson3.springboot.JacksonDataFormatConfiguration", + "sourceType": "org.apache.camel.component.jackson3.springboot.JacksonDataFormatConfiguration" + }, + { + "name": "camel.dataformat.jackson.customizer", + "type": "org.apache.camel.spring.boot.DataFormatConfigurationPropertiesCommon$CustomizerProperties", + "sourceType": "org.apache.camel.component.jackson3.springboot.JacksonDataFormatConfiguration", + "sourceMethod": "getCustomizer()" + } + ], + "properties": [ + { + "name": "camel.dataformat.jackson.allow-jms-type", + "type": "java.lang.Boolean", + "description": "Used for JMS users to allow the JMSType header from the JMS spec to specify a FQN classname to use to unmarshal to.", + "sourceType": "org.apache.camel.component.jackson3.springboot.JacksonDataFormatConfiguration", + "defaultValue": false + }, + { + "name": "camel.dataformat.jackson.allow-unmarshall-type", + "type": "java.lang.Boolean", + "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.", + "sourceType": "org.apache.camel.component.jackson3.springboot.JacksonDataFormatConfiguration", + "defaultValue": false + }, + { + "name": "camel.dataformat.jackson.auto-discover-object-mapper", + "type": "java.lang.Boolean", + "description": "If set to true then Jackson will look for an objectMapper to use from the registry", + "sourceType": "org.apache.camel.component.jackson3.springboot.JacksonDataFormatConfiguration", + "defaultValue": false + }, + { + "name": "camel.dataformat.jackson.auto-discover-schema-resolver", + "type": "java.lang.Boolean", + "description": "When not disabled, the SchemaResolver will be looked up into the registry", + "sourceType": "org.apache.camel.component.jackson3.springboot.JacksonDataFormatConfiguration", + "defaultValue": true + }, + { + "name": "camel.dataformat.jackson.collection-type", + "type": "java.lang.String", + "description": "Refers to a custom collection type to lookup in the registry to use. This option should rarely be used, but allows using different collection types than java.util.Collection based as default.", + "sourceType": "org.apache.camel.component.jackson3.springboot.JacksonDataFormatConfiguration" + }, + { + "name": "camel.dataformat.jackson.combine-unicode-surrogates", + "type": "java.lang.Boolean", + "description": "Force generator that outputs JSON content to combine surrogate pairs (if any) into 4-byte characters. This should be preferred when using 4-byte characters such as Japanese.", + "sourceType": "org.apache.camel.component.jackson3.springboot.JacksonDataFormatConfiguration", + "defaultValue": false + }, + { + "name": "camel.dataformat.jackson.content-type-header", + "type": "java.lang.Boolean", + "description": "Whether the data format should set the Content-Type header with the type from the data format. For example application\/xml for data formats marshalling to XML, or application\/json for data formats marshalling to JSON", + "sourceType": "org.apache.camel.component.jackson3.springboot.JacksonDataFormatConfiguration", + "defaultValue": true + }, + { + "name": "camel.dataformat.jackson.customizer.enabled", + "type": "java.lang.Boolean", + "sourceType": "org.apache.camel.spring.boot.DataFormatConfigurationPropertiesCommon$CustomizerProperties" + }, + { + "name": "camel.dataformat.jackson.disable-features", + "type": "java.lang.String", + "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.DeserializationFeature, or com.fasterxml.jackson.databind.MapperFeature Multiple features can be separated by comma", + "sourceType": "org.apache.camel.component.jackson3.springboot.JacksonDataFormatConfiguration" + }, + { + "name": "camel.dataformat.jackson.enable-features", + "type": "java.lang.String", + "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, or com.fasterxml.jackson.databind.MapperFeature Multiple features can be separated by comma", + "sourceType": "org.apache.camel.component.jackson3.springboot.JacksonDataFormatConfiguration" + }, + { + "name": "camel.dataformat.jackson.enabled", + "type": "java.lang.Boolean", + "description": "Whether to enable auto configuration of the jackson data format. This is enabled by default.", + "sourceType": "org.apache.camel.component.jackson3.springboot.JacksonDataFormatConfiguration" + }, + { + "name": "camel.dataformat.jackson.include", + "type": "java.lang.String", + "description": "If you want to marshal a pojo to JSON, and the pojo has some fields with null values. And you want to skip these null values, you can set this option to NON_NULL", + "sourceType": "org.apache.camel.component.jackson3.springboot.JacksonDataFormatConfiguration" + }, + { + "name": "camel.dataformat.jackson.json-view", + "type": "java.lang.String", + "description": "When marshalling a POJO to JSON you might want to exclude certain fields from the JSON output. With Jackson you can use JSON views to accomplish this. This option is to refer to the class which has JsonView annotations", + "sourceType": "org.apache.camel.component.jackson3.springboot.JacksonDataFormatConfiguration" + }, + { + "name": "camel.dataformat.jackson.max-string-length", + "type": "java.lang.Integer", + "description": "Jackson. Sets the maximum string length (in chars or bytes, depending on input context). The default is 20,000,000. This limit is not exact, the limit is applied when we increase internal buffer sizes and an exception will happen at sizes greater than this limit. Some text values that are a little bigger than the limit may be treated as valid but no text values with sizes less than or equal to this limit will be treated as invalid.", + "sourceType": "org.apache.camel.component.jackson3.springboot.JacksonDataFormatConfiguration" + }, + { + "name": "camel.dataformat.jackson.module-class-names", + "type": "java.lang.String", + "description": "To use custom Jackson modules com.fasterxml.jackson.databind.Module specified as a String with FQN class names. Multiple classes can be separated by comma.", + "sourceType": "org.apache.camel.component.jackson3.springboot.JacksonDataFormatConfiguration" + }, + { + "name": "camel.dataformat.jackson.module-refs", + "type": "java.lang.String", + "description": "To use custom Jackson modules referred from the Camel registry. Multiple modules can be separated by comma.", + "sourceType": "org.apache.camel.component.jackson3.springboot.JacksonDataFormatConfiguration" + }, + { + "name": "camel.dataformat.jackson.naming-strategy", + "type": "java.lang.String", + "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", + "sourceType": "org.apache.camel.component.jackson3.springboot.JacksonDataFormatConfiguration" + }, + { + "name": "camel.dataformat.jackson.object-mapper", + "type": "java.lang.String", + "description": "Lookup and use the existing ObjectMapper with the given id when using Jackson.", + "sourceType": "org.apache.camel.component.jackson3.springboot.JacksonDataFormatConfiguration" + }, + { + "name": "camel.dataformat.jackson.pretty-print", + "type": "java.lang.Boolean", + "description": "To enable pretty printing output nicely formatted. Is by default false.", + "sourceType": "org.apache.camel.component.jackson3.springboot.JacksonDataFormatConfiguration", + "defaultValue": false + }, + { + "name": "camel.dataformat.jackson.schema-resolver", + "type": "java.lang.String", + "description": "Optional schema resolver used to lookup schemas for the data in transit. The option is a org.apache.camel.component.jackson3.SchemaResolver type.", + "sourceType": "org.apache.camel.component.jackson3.springboot.JacksonDataFormatConfiguration" + }, + { + "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 and fastjson.", + "sourceType": "org.apache.camel.component.jackson3.springboot.JacksonDataFormatConfiguration" + }, + { + "name": "camel.dataformat.jackson.unmarshal-type", + "type": "java.lang.String", + "description": "Class name of the java type to use when unmarshalling", + "sourceType": "org.apache.camel.component.jackson3.springboot.JacksonDataFormatConfiguration" + }, + { + "name": "camel.dataformat.jackson.use-default-object-mapper", + "type": "java.lang.Boolean", + "description": "Whether to lookup and use default Jackson ObjectMapper from the registry.", + "sourceType": "org.apache.camel.component.jackson3.springboot.JacksonDataFormatConfiguration", + "defaultValue": true + }, + { + "name": "camel.dataformat.jackson.use-list", + "type": "java.lang.Boolean", + "description": "To unmarshal to a List of Map or a List of Pojo.", + "sourceType": "org.apache.camel.component.jackson3.springboot.JacksonDataFormatConfiguration", + "defaultValue": false + } + ], + "hints": [], + "ignored": { + "properties": [] + } +} \ No newline at end of file diff --git a/components-starter/camel-jackson3-starter/src/main/java/org/apache/camel/component/jackson3/springboot/JacksonDataFormatAutoConfiguration.java b/components-starter/camel-jackson3-starter/src/main/java/org/apache/camel/component/jackson3/springboot/JacksonDataFormatAutoConfiguration.java new file mode 100644 index 00000000000..a4328415d06 --- /dev/null +++ b/components-starter/camel-jackson3-starter/src/main/java/org/apache/camel/component/jackson3/springboot/JacksonDataFormatAutoConfiguration.java @@ -0,0 +1,78 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.camel.component.jackson3.springboot; + +import org.apache.camel.CamelContext; +import org.apache.camel.component.jackson3.JacksonDataFormat; +import org.apache.camel.spi.DataFormat; +import org.apache.camel.spi.DataFormatCustomizer; +import org.apache.camel.spring.boot.CamelAutoConfiguration; +import org.apache.camel.spring.boot.DataFormatConfigurationProperties; +import org.apache.camel.spring.boot.util.CamelPropertiesHelper; +import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans; +import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties; +import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.autoconfigure.AutoConfigureAfter; +import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.boot.convert.ApplicationConversionService; +import org.springframework.context.ApplicationContext; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Conditional; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Lazy; + +/** + * Generated by camel-package-maven-plugin - do not edit this file! + */ +@Configuration(proxyBeanMethods = false) +@AutoConfigureAfter(CamelAutoConfiguration.class) +@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class) +@EnableConfigurationProperties({DataFormatConfigurationProperties.class,JacksonDataFormatConfiguration.class}) +@ConditionalOnHierarchicalProperties({"camel.dataformat", "camel.dataformat.jackson"}) +public class JacksonDataFormatAutoConfiguration { + + @Autowired + private ApplicationContext applicationContext; + private final CamelContext camelContext; + @Autowired + private JacksonDataFormatConfiguration configuration; + + public JacksonDataFormatAutoConfiguration( + org.apache.camel.CamelContext camelContext) { + this.camelContext = camelContext; + } + + @Lazy + @Bean + public DataFormatCustomizer configureJacksonDataFormatFactory() { + return new DataFormatCustomizer() { + @Override + public void configure(String name, DataFormat target) { + CamelPropertiesHelper.copyProperties(camelContext, configuration, target); + } + @Override + public boolean isEnabled(String name, DataFormat target) { + return HierarchicalPropertiesEvaluator.evaluate( + applicationContext, + "camel.dataformat.customizer", + "camel.dataformat.jackson.customizer") + && target instanceof JacksonDataFormat; + } + }; + } +} \ No newline at end of file diff --git a/components-starter/camel-jackson3-starter/src/main/java/org/apache/camel/component/jackson3/springboot/JacksonDataFormatConfiguration.java b/components-starter/camel-jackson3-starter/src/main/java/org/apache/camel/component/jackson3/springboot/JacksonDataFormatConfiguration.java new file mode 100644 index 00000000000..10522bc755c --- /dev/null +++ b/components-starter/camel-jackson3-starter/src/main/java/org/apache/camel/component/jackson3/springboot/JacksonDataFormatConfiguration.java @@ -0,0 +1,342 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.camel.component.jackson3.springboot; + +import org.apache.camel.spring.boot.DataFormatConfigurationPropertiesCommon; +import org.springframework.boot.context.properties.ConfigurationProperties; + +/** + * Marshal POJOs to JSON and back using Jackson. + * + * Generated by camel-package-maven-plugin - do not edit this file! + */ +@ConfigurationProperties(prefix = "camel.dataformat.jackson") +public class JacksonDataFormatConfiguration + extends + DataFormatConfigurationPropertiesCommon { + + /** + * Whether to enable auto configuration of the jackson data format. This is + * enabled by default. + */ + private Boolean enabled; + /** + * Lookup and use the existing ObjectMapper with the given id when using + * Jackson. + */ + private String objectMapper; + /** + * Whether to lookup and use default Jackson ObjectMapper from the registry. + */ + private Boolean useDefaultObjectMapper = true; + /** + * If set to true then Jackson will look for an objectMapper to use from the + * registry + */ + private Boolean autoDiscoverObjectMapper = false; + /** + * To enable pretty printing output nicely formatted. Is by default false. + */ + private Boolean prettyPrint = false; + /** + * Force generator that outputs JSON content to combine surrogate pairs (if + * any) into 4-byte characters. This should be preferred when using 4-byte + * characters such as Japanese. + */ + private Boolean combineUnicodeSurrogates = false; + /** + * Class name of the java type to use when unmarshalling + */ + private String unmarshalType; + /** + * When marshalling a POJO to JSON you might want to exclude certain fields + * from the JSON output. With Jackson you can use JSON views to accomplish + * this. This option is to refer to the class which has JsonView annotations + */ + private String jsonView; + /** + * If you want to marshal a pojo to JSON, and the pojo has some fields with + * null values. And you want to skip these null values, you can set this + * option to NON_NULL + */ + private String include; + /** + * Used for JMS users to allow the JMSType header from the JMS spec to + * specify a FQN classname to use to unmarshal to. + */ + private Boolean allowJmsType = false; + /** + * Refers to a custom collection type to lookup in the registry to use. This + * option should rarely be used, but allows using different collection types + * than java.util.Collection based as default. + */ + private String collectionType; + /** + * To unmarshal to a List of Map or a List of Pojo. + */ + private Boolean useList = false; + /** + * To use custom Jackson modules com.fasterxml.jackson.databind.Module + * specified as a String with FQN class names. Multiple classes can be + * separated by comma. + */ + private String moduleClassNames; + /** + * To use custom Jackson modules referred from the Camel registry. Multiple + * modules can be separated by comma. + */ + private String moduleRefs; + /** + * 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, or + * com.fasterxml.jackson.databind.MapperFeature Multiple features can be + * separated by comma + */ + private String enableFeatures; + /** + * 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.DeserializationFeature, or + * com.fasterxml.jackson.databind.MapperFeature Multiple features can be + * separated by comma + */ + private String disableFeatures; + /** + * 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. + */ + 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 + * and fastjson. + */ + private String timezone; + /** + * Optional schema resolver used to lookup schemas for the data in transit. + * The option is a org.apache.camel.component.jackson3.SchemaResolver type. + */ + private String schemaResolver; + /** + * When not disabled, the SchemaResolver will be looked up into the registry + */ + private Boolean autoDiscoverSchemaResolver = true; + /** + * 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 + */ + private String namingStrategy; + /** + * Whether the data format should set the Content-Type header with the type + * from the data format. For example application/xml for data formats + * marshalling to XML, or application/json for data formats marshalling to + * JSON + */ + private Boolean contentTypeHeader = true; + /** + * Jackson. Sets the maximum string length (in chars or bytes, depending on + * input context). The default is 20,000,000. This limit is not exact, the + * limit is applied when we increase internal buffer sizes and an exception + * will happen at sizes greater than this limit. Some text values that are a + * little bigger than the limit may be treated as valid but no text values + * with sizes less than or equal to this limit will be treated as invalid. + */ + private Integer maxStringLength; + + public String getObjectMapper() { + return objectMapper; + } + + public void setObjectMapper(String objectMapper) { + this.objectMapper = objectMapper; + } + + public Boolean getUseDefaultObjectMapper() { + return useDefaultObjectMapper; + } + + public void setUseDefaultObjectMapper(Boolean useDefaultObjectMapper) { + this.useDefaultObjectMapper = useDefaultObjectMapper; + } + + public Boolean getAutoDiscoverObjectMapper() { + return autoDiscoverObjectMapper; + } + + public void setAutoDiscoverObjectMapper(Boolean autoDiscoverObjectMapper) { + this.autoDiscoverObjectMapper = autoDiscoverObjectMapper; + } + + public Boolean getPrettyPrint() { + return prettyPrint; + } + + public void setPrettyPrint(Boolean prettyPrint) { + this.prettyPrint = prettyPrint; + } + + public Boolean getCombineUnicodeSurrogates() { + return combineUnicodeSurrogates; + } + + public void setCombineUnicodeSurrogates(Boolean combineUnicodeSurrogates) { + this.combineUnicodeSurrogates = combineUnicodeSurrogates; + } + + public String getUnmarshalType() { + return unmarshalType; + } + + public void setUnmarshalType(String unmarshalType) { + this.unmarshalType = unmarshalType; + } + + public String getJsonView() { + return jsonView; + } + + public void setJsonView(String jsonView) { + this.jsonView = jsonView; + } + + public String getInclude() { + return include; + } + + public void setInclude(String include) { + this.include = include; + } + + public Boolean getAllowJmsType() { + return allowJmsType; + } + + public void setAllowJmsType(Boolean allowJmsType) { + this.allowJmsType = allowJmsType; + } + + public String getCollectionType() { + return collectionType; + } + + public void setCollectionType(String collectionType) { + this.collectionType = collectionType; + } + + public Boolean getUseList() { + return useList; + } + + public void setUseList(Boolean useList) { + this.useList = useList; + } + + public String getModuleClassNames() { + return moduleClassNames; + } + + public void setModuleClassNames(String moduleClassNames) { + this.moduleClassNames = moduleClassNames; + } + + public String getModuleRefs() { + return moduleRefs; + } + + public void setModuleRefs(String moduleRefs) { + this.moduleRefs = moduleRefs; + } + + public String getEnableFeatures() { + return enableFeatures; + } + + public void setEnableFeatures(String enableFeatures) { + this.enableFeatures = enableFeatures; + } + + public String getDisableFeatures() { + return disableFeatures; + } + + public void setDisableFeatures(String disableFeatures) { + this.disableFeatures = disableFeatures; + } + + public Boolean getAllowUnmarshallType() { + return allowUnmarshallType; + } + + public void setAllowUnmarshallType(Boolean allowUnmarshallType) { + this.allowUnmarshallType = allowUnmarshallType; + } + + public String getTimezone() { + return timezone; + } + + public void setTimezone(String timezone) { + this.timezone = timezone; + } + + public String getSchemaResolver() { + return schemaResolver; + } + + public void setSchemaResolver(String schemaResolver) { + this.schemaResolver = schemaResolver; + } + + public Boolean getAutoDiscoverSchemaResolver() { + return autoDiscoverSchemaResolver; + } + + public void setAutoDiscoverSchemaResolver(Boolean autoDiscoverSchemaResolver) { + this.autoDiscoverSchemaResolver = autoDiscoverSchemaResolver; + } + + public String getNamingStrategy() { + return namingStrategy; + } + + public void setNamingStrategy(String namingStrategy) { + this.namingStrategy = namingStrategy; + } + + public Boolean getContentTypeHeader() { + return contentTypeHeader; + } + + public void setContentTypeHeader(Boolean contentTypeHeader) { + this.contentTypeHeader = contentTypeHeader; + } + + public Integer getMaxStringLength() { + return maxStringLength; + } + + public void setMaxStringLength(Integer maxStringLength) { + this.maxStringLength = maxStringLength; + } +} \ No newline at end of file diff --git a/components-starter/camel-jackson3-starter/src/main/java/org/apache/camel/component/jackson3/springboot/JacksonDataFormatConverter.java b/components-starter/camel-jackson3-starter/src/main/java/org/apache/camel/component/jackson3/springboot/JacksonDataFormatConverter.java new file mode 100644 index 00000000000..4acd12c8ed7 --- /dev/null +++ b/components-starter/camel-jackson3-starter/src/main/java/org/apache/camel/component/jackson3/springboot/JacksonDataFormatConverter.java @@ -0,0 +1,64 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.camel.component.jackson3.springboot; + +import java.util.LinkedHashSet; +import java.util.Set; +import org.apache.camel.CamelContext; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; +import org.springframework.context.ApplicationContext; +import org.springframework.context.annotation.Configuration; +import org.springframework.core.convert.TypeDescriptor; +import org.springframework.core.convert.converter.GenericConverter; +import org.springframework.stereotype.Component; + +/** + * Generated by camel-package-maven-plugin - do not edit this file! + */ +@Configuration(proxyBeanMethods = false) +@ConfigurationPropertiesBinding +@Component +public class JacksonDataFormatConverter implements GenericConverter { + + @Autowired + private ApplicationContext applicationContext; + + public Set<ConvertiblePair> getConvertibleTypes() { + Set<ConvertiblePair> answer = new LinkedHashSet<>(); + answer.add(new ConvertiblePair(String.class, org.apache.camel.component.jackson3.SchemaResolver.class)); + return answer; + } + + public Object convert( + Object source, + TypeDescriptor sourceType, + TypeDescriptor targetType) { + if (source == null) { + return null; + } + String ref = source.toString(); + if (!ref.startsWith("#")) { + return null; + } + ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); + switch (targetType.getName()) { + case "org.apache.camel.component.jackson3.SchemaResolver": return applicationContext.getBean(ref, org.apache.camel.component.jackson3.SchemaResolver.class); + } + return null; + } +} \ No newline at end of file diff --git a/components-starter/camel-jackson3-starter/src/main/resources/META-INF/LICENSE.txt b/components-starter/camel-jackson3-starter/src/main/resources/META-INF/LICENSE.txt new file mode 100644 index 00000000000..6b0b1270ff0 --- /dev/null +++ b/components-starter/camel-jackson3-starter/src/main/resources/META-INF/LICENSE.txt @@ -0,0 +1,203 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + diff --git a/components-starter/camel-jackson3-starter/src/main/resources/META-INF/NOTICE.txt b/components-starter/camel-jackson3-starter/src/main/resources/META-INF/NOTICE.txt new file mode 100644 index 00000000000..2e215bf2e6b --- /dev/null +++ b/components-starter/camel-jackson3-starter/src/main/resources/META-INF/NOTICE.txt @@ -0,0 +1,11 @@ + ========================================================================= + == NOTICE file corresponding to the section 4 d of == + == the Apache License, Version 2.0, == + == in this case for the Apache Camel distribution. == + ========================================================================= + + This product includes software developed by + The Apache Software Foundation (http://www.apache.org/). + + Please read the different LICENSE files present in the licenses directory of + this distribution. diff --git a/components-starter/camel-jackson3-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/components-starter/camel-jackson3-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 00000000000..2e3e394278d --- /dev/null +++ b/components-starter/camel-jackson3-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,17 @@ +## --------------------------------------------------------------------------- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## --------------------------------------------------------------------------- +org.apache.camel.component.jackson3.springboot.JacksonDataFormatAutoConfiguration diff --git a/components-starter/pom.xml b/components-starter/pom.xml index 6500dd5179e..f8a7b14cc37 100644 --- a/components-starter/pom.xml +++ b/components-starter/pom.xml @@ -294,6 +294,7 @@ <module>camel-jackson-starter</module> <module>camel-jackson3-avro-starter</module> <module>camel-jackson3-protobuf-starter</module> + <module>camel-jackson3-starter</module> <module>camel-jackson3xml-starter</module> <module>camel-jacksonxml-starter</module> <module>camel-jandex-starter</module> diff --git a/tooling/camel-spring-boot-bom/pom.xml b/tooling/camel-spring-boot-bom/pom.xml index c50ddbe3f84..acc2ea7299a 100644 --- a/tooling/camel-spring-boot-bom/pom.xml +++ b/tooling/camel-spring-boot-bom/pom.xml @@ -1008,6 +1008,11 @@ <artifactId>camel-jackson3-protobuf-starter</artifactId> <version>4.19.0-SNAPSHOT</version> </dependency> + <dependency> + <groupId>org.apache.camel.springboot</groupId> + <artifactId>camel-jackson3-starter</artifactId> + <version>4.19.0-SNAPSHOT</version> + </dependency> <dependency> <groupId>org.apache.camel.springboot</groupId> <artifactId>camel-jackson3xml-starter</artifactId> diff --git a/tooling/camel-spring-boot-dependencies/pom.xml b/tooling/camel-spring-boot-dependencies/pom.xml index 8f1a6b59fa7..2e34ce61320 100644 --- a/tooling/camel-spring-boot-dependencies/pom.xml +++ b/tooling/camel-spring-boot-dependencies/pom.xml @@ -1292,6 +1292,11 @@ <artifactId>camel-jackson3-protobuf-starter</artifactId> <version>${project.version}</version> </dependency> + <dependency> + <groupId>org.apache.camel.springboot</groupId> + <artifactId>camel-jackson3-starter</artifactId> + <version>${project.version}</version> + </dependency> <dependency> <groupId>org.apache.camel.springboot</groupId> <artifactId>camel-jackson3xml-starter</artifactId> diff --git a/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/SpringBootAutoConfigurationMojo.java b/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/SpringBootAutoConfigurationMojo.java index 8ad383d61eb..b6d06828697 100644 --- a/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/SpringBootAutoConfigurationMojo.java +++ b/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/SpringBootAutoConfigurationMojo.java @@ -570,10 +570,6 @@ public class SpringBootAutoConfigurationMojo extends AbstractSpringBootGenerator // special for jackson vs jackson3 boolean jackson3 = componentJar.getName().contains("camel-jackson3"); - if (jackson3) { - dataFormatNames.remove("jackson"); - dataFormatNames.add("jackson3"); - } // create auto configuration for the data formats if (!dataFormatNames.isEmpty()) { @@ -584,6 +580,19 @@ public class SpringBootAutoConfigurationMojo extends AbstractSpringBootGenerator String json = loadDataFormatJson(jsonFiles, dataFormatName); if (json != null) { DataFormatModel model = JsonMapper.generateDataFormatModel(json); + if (jackson3 && "camel-jackson3".equals(model.getArtifactId())) { + // for jackson3 we need to update the model to use the jackson3 package name + String fqn = model.getModelJavaType(); + fqn = fqn.replace(".jackson.", ".jackson3."); + model.setModelJavaType(fqn); + model.getOptions().forEach(o -> { + String type = o.getJavaType(); + if (type != null) { + type = type.replace(".jackson.", ".jackson3."); + o.setJavaType(type); + } + }); + } allModels.add(model); } }
