This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git
commit a7a6e55173d669d26bac04a6f3003d7b57e18064 Author: Andrea Cosentino <anco...@gmail.com> AuthorDate: Thu Nov 18 11:53:04 2021 +0100 CAMEL-16912 - camel-jackson - Make it easy to configure property naming strategy --- .../jackson/JacksonDataFormatConfigurer.java | 2 +- .../jackson/AbstractJacksonDataFormat.java | 7 +++++- .../jackson/JacksonMarshalNamingStrategyTest.java | 3 --- .../component/jackson/PojoNamingStrategy.java | 28 +++++++++++----------- 4 files changed, 21 insertions(+), 19 deletions(-) diff --git a/components/camel-jackson/src/generated/java/org/apache/camel/component/jackson/JacksonDataFormatConfigurer.java b/components/camel-jackson/src/generated/java/org/apache/camel/component/jackson/JacksonDataFormatConfigurer.java index bc227a6..42ea935 100644 --- a/components/camel-jackson/src/generated/java/org/apache/camel/component/jackson/JacksonDataFormatConfigurer.java +++ b/components/camel-jackson/src/generated/java/org/apache/camel/component/jackson/JacksonDataFormatConfigurer.java @@ -51,7 +51,7 @@ public class JacksonDataFormatConfigurer extends PropertyConfigurerSupport imple case "autodiscoverobjectmapper": case "autoDiscoverObjectMapper": dataformat.setAutoDiscoverObjectMapper(property(camelContext, boolean.class, value)); return true; case "schemaresolver": - case "schemaResolver": dataformat.setSchemaResolver(property(camelContext, org.apache.camel.component.jackson.SchemaResolver.class, value)); return true; + case "schemaResolver": dataformat.setSchemaResolver(property(camelContext, com.fasterxml.jackson.databind.SchemaResolver.class, value)); return true; case "autodiscoverschemaresolver": case "autoDiscoverSchemaResolver": dataformat.setAutoDiscoverSchemaResolver(property(camelContext, boolean.class, value)); return true; default: return false; diff --git a/components/camel-jackson/src/main/java/org/apache/camel/component/jackson/AbstractJacksonDataFormat.java b/components/camel-jackson/src/main/java/org/apache/camel/component/jackson/AbstractJacksonDataFormat.java index 7b83b0d..3a8cb16 100644 --- a/components/camel-jackson/src/main/java/org/apache/camel/component/jackson/AbstractJacksonDataFormat.java +++ b/components/camel-jackson/src/main/java/org/apache/camel/component/jackson/AbstractJacksonDataFormat.java @@ -29,8 +29,13 @@ import java.util.TimeZone; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.core.FormatSchema; -import com.fasterxml.jackson.databind.*; +import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.MapperFeature; import com.fasterxml.jackson.databind.Module; +import com.fasterxml.jackson.databind.Module; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.PropertyNamingStrategy; +import com.fasterxml.jackson.databind.SerializationFeature; import com.fasterxml.jackson.databind.type.CollectionType; import org.apache.camel.CamelContext; import org.apache.camel.CamelContextAware; diff --git a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalNamingStrategyTest.java b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalNamingStrategyTest.java index c6de91e..612a2f1 100644 --- a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalNamingStrategyTest.java +++ b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalNamingStrategyTest.java @@ -22,9 +22,6 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.test.junit5.CamelTestSupport; import org.junit.jupiter.api.Test; -import java.util.HashMap; -import java.util.Map; - import static org.junit.jupiter.api.Assertions.assertEquals; public class JacksonMarshalNamingStrategyTest extends CamelTestSupport { diff --git a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/PojoNamingStrategy.java b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/PojoNamingStrategy.java index b7bd28f..0eb2416 100644 --- a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/PojoNamingStrategy.java +++ b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/PojoNamingStrategy.java @@ -2,23 +2,23 @@ package org.apache.camel.component.jackson; public class PojoNamingStrategy { - private String fieldOne; + private String fieldOne; - private String fieldTwo; + private String fieldTwo; - public String getFieldOne() { - return fieldOne; - } + public String getFieldOne() { + return fieldOne; + } - public void setFieldOne(String fieldOne) { - this.fieldOne = fieldOne; - } + public void setFieldOne(String fieldOne) { + this.fieldOne = fieldOne; + } - public String getFieldTwo() { - return fieldTwo; - } + public String getFieldTwo() { + return fieldTwo; + } - public void setFieldTwo(String kFieldTwo) { - this.fieldTwo = kFieldTwo; - } + public void setFieldTwo(String kFieldTwo) { + this.fieldTwo = kFieldTwo; + } }