Repository: camel Updated Branches: refs/heads/master 6e502b701 -> c59787bc7
CAMEL-8554: camel-jackson must explicit be anbled to allow fallback type converter as otherwise this can cause side-effect and surprises for users. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c59787bc Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c59787bc Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c59787bc Branch: refs/heads/master Commit: c59787bc7dbe98184f8d2d912613e82824d5eed5 Parents: 6e502b7 Author: Claus Ibsen <[email protected]> Authored: Mon Jul 27 14:42:44 2015 +0200 Committer: Claus Ibsen <[email protected]> Committed: Mon Jul 27 14:42:44 2015 +0200 ---------------------------------------------------------------------- components/camel-jackson/pom.xml | 5 -- .../component/jackson/JacksonConstants.java | 2 + .../component/jackson/JacksonDataFormat.java | 15 +++++ .../converter/JacksonTypeConverters.java | 30 ++++++++-- .../jackson/JacksonConversionsSimpleTest.java | 58 ++++++++++---------- .../jackson/JacksonConversionsTest.java | 9 +++ 6 files changed, 79 insertions(+), 40 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/c59787bc/components/camel-jackson/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-jackson/pom.xml b/components/camel-jackson/pom.xml index 8c7445e..a5eb9a8 100644 --- a/components/camel-jackson/pom.xml +++ b/components/camel-jackson/pom.xml @@ -70,11 +70,6 @@ <artifactId>junit</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <scope>test</scope> - </dependency> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/camel/blob/c59787bc/components/camel-jackson/src/main/java/org/apache/camel/component/jackson/JacksonConstants.java ---------------------------------------------------------------------- diff --git a/components/camel-jackson/src/main/java/org/apache/camel/component/jackson/JacksonConstants.java b/components/camel-jackson/src/main/java/org/apache/camel/component/jackson/JacksonConstants.java index fd1ffaa..1429dc0 100644 --- a/components/camel-jackson/src/main/java/org/apache/camel/component/jackson/JacksonConstants.java +++ b/components/camel-jackson/src/main/java/org/apache/camel/component/jackson/JacksonConstants.java @@ -18,6 +18,8 @@ package org.apache.camel.component.jackson; public final class JacksonConstants { + public static final String ENABLE_TYPE_CONVERTER = "CamelJacksonEnableTypeConverter"; + public static final String UNMARSHAL_TYPE = "CamelJacksonUnmarshalType"; private JacksonConstants() { http://git-wip-us.apache.org/repos/asf/camel/blob/c59787bc/components/camel-jackson/src/main/java/org/apache/camel/component/jackson/JacksonDataFormat.java ---------------------------------------------------------------------- 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 fbdd2b7..b7e9b29 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 @@ -66,6 +66,7 @@ public class JacksonDataFormat extends ServiceSupport implements DataFormat, Cam private boolean enableJaxbAnnotationModule; private String enableFeatures; private String disableFeatures; + private boolean enableJacksonTypeConverter; /** * Use the default Jackson {@link ObjectMapper} and {@link Map} @@ -303,6 +304,20 @@ public class JacksonDataFormat extends ServiceSupport implements DataFormat, Cam this.allowJmsType = allowJmsType; } + public boolean isEnableJacksonTypeConverter() { + return enableJacksonTypeConverter; + } + + /** + * If enabled then Jackson is allowed to attempt to be used during Camels <a href="https://camel.apache.org/type-converter.html">type converter</a> + * as a {@link org.apache.camel.FallbackConverter} that attempts to convert POJOs to/from {@link Map}/{@link List} types. + * <p/> + * This should only be enabled when desired to be used. + */ + public void setEnableJacksonTypeConverter(boolean enableJacksonTypeConverter) { + this.enableJacksonTypeConverter = enableJacksonTypeConverter; + } + public String getEnableFeatures() { return enableFeatures; } http://git-wip-us.apache.org/repos/asf/camel/blob/c59787bc/components/camel-jackson/src/main/java/org/apache/camel/component/jackson/converter/JacksonTypeConverters.java ---------------------------------------------------------------------- diff --git a/components/camel-jackson/src/main/java/org/apache/camel/component/jackson/converter/JacksonTypeConverters.java b/components/camel-jackson/src/main/java/org/apache/camel/component/jackson/converter/JacksonTypeConverters.java index 345c9b8..5cb2451 100644 --- a/components/camel-jackson/src/main/java/org/apache/camel/component/jackson/converter/JacksonTypeConverters.java +++ b/components/camel-jackson/src/main/java/org/apache/camel/component/jackson/converter/JacksonTypeConverters.java @@ -22,28 +22,46 @@ import java.util.Set; import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.camel.Exchange; import org.apache.camel.FallbackConverter; +import org.apache.camel.component.jackson.JacksonConstants; import org.apache.camel.spi.Registry; import org.apache.camel.spi.TypeConverterRegistry; public final class JacksonTypeConverters { - private static final ObjectMapper DEFAULT_MAPPER = new ObjectMapper(); + private final ObjectMapper defaultMapper = new ObjectMapper(); + private boolean init; + private Boolean enabled; - private JacksonTypeConverters() { + public JacksonTypeConverters() { } @FallbackConverter - public static <T> T convertTo(Class<T> type, Exchange exchange, Object value, TypeConverterRegistry registry) { + public <T> T convertTo(Class<T> type, Exchange exchange, Object value, TypeConverterRegistry registry) { + + // only do this if enabled + if (!init && exchange != null) { + // init to see if this is enabled + String text = exchange.getContext().getProperties().get(JacksonConstants.ENABLE_TYPE_CONVERTER); + enabled = "true".equalsIgnoreCase(text); + init = true; + } + + if (enabled == null || !enabled) { + return null; + } + + if (isNotPojoType(type)) { return null; } - if (value instanceof Map) { + if (exchange != null && value instanceof Map) { ObjectMapper mapper = resolveObjectMapper(exchange.getContext().getRegistry()); if (mapper.canSerialize(type)) { return mapper.convertValue(value, type); } } + // Just return null to let other fallback converter to do the job return null; } @@ -57,12 +75,12 @@ public final class JacksonTypeConverters { return isString || isNumber; } - private static ObjectMapper resolveObjectMapper(Registry registry) { + private ObjectMapper resolveObjectMapper(Registry registry) { Set<ObjectMapper> mappers = registry.findByType(ObjectMapper.class); if (mappers.size() == 1) { return mappers.iterator().next(); } - return DEFAULT_MAPPER; + return defaultMapper; } } http://git-wip-us.apache.org/repos/asf/camel/blob/c59787bc/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonConversionsSimpleTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonConversionsSimpleTest.java b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonConversionsSimpleTest.java index 53e0fb6..1128fa4 100644 --- a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonConversionsSimpleTest.java +++ b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonConversionsSimpleTest.java @@ -17,53 +17,53 @@ package org.apache.camel.component.jackson; import java.util.HashMap; +import java.util.Map; -import static java.util.Collections.singleton; - -import com.fasterxml.jackson.databind.ObjectMapper; +import org.apache.camel.CamelContext; import org.apache.camel.Exchange; -import org.junit.Assert; +import org.apache.camel.impl.DefaultExchange; +import org.apache.camel.test.junit4.CamelTestSupport; import org.junit.Test; -import static org.apache.camel.component.jackson.converter.JacksonTypeConverters.convertTo; -import static org.mockito.BDDMockito.given; -import static org.mockito.Matchers.eq; -import static org.mockito.Mockito.RETURNS_DEEP_STUBS; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.verify; +public class JacksonConversionsSimpleTest extends CamelTestSupport { + + @Override + public boolean isUseRouteBuilder() { + return false; + } -public class JacksonConversionsSimpleTest extends Assert { + @Override + protected CamelContext createCamelContext() throws Exception { + CamelContext context = super.createCamelContext(); + // enable jackson type converter by setting this property on CamelContext + context.getProperties().put(JacksonConstants.ENABLE_TYPE_CONVERTER, "true"); + return context; + } @Test public void shouldNotConvertMapToString() { - Object convertedObject = convertTo(String.class, null, new HashMap<String, String>(), null); - assertNull(convertedObject); + Exchange exchange = new DefaultExchange(context); + + Map<String, String> body = new HashMap<String, String>(); + Object convertedObject = context.getTypeConverter().convertTo(String.class, exchange, body); + // will do a toString which is an empty map + assertEquals(body.toString(), convertedObject); } @Test public void shouldNotConvertMapToNumber() { - Object convertedObject = convertTo(Long.class, null, new HashMap<String, String>(), null); - assertNull(convertedObject); - } + Exchange exchange = new DefaultExchange(context); - @Test - public void shouldNotConvertMapToPrimitive() { - Object convertedObject = convertTo(long.class, null, new HashMap<String, String>(), null); + Object convertedObject = context.getTypeConverter().convertTo(Long.class, exchange, new HashMap<String, String>()); assertNull(convertedObject); } @Test - public void shouldResolveMapperFromRegistry() { - // Given - Exchange exchange = mock(Exchange.class, RETURNS_DEEP_STUBS); - ObjectMapper mapper = mock(ObjectMapper.class); - given(exchange.getContext().getRegistry().findByType(eq(ObjectMapper.class))).willReturn(singleton(mapper)); - - // When - convertTo(TestPojo.class, exchange, new HashMap<String, String>(), null); + public void shouldNotConvertMapToPrimitive() { + Exchange exchange = new DefaultExchange(context); + Object convertedObject = context.getTypeConverter().convertTo(long.class, exchange, new HashMap<String, String>()); - // Then - verify(mapper).canSerialize(TestPojo.class); + assertNull(convertedObject); } } http://git-wip-us.apache.org/repos/asf/camel/blob/c59787bc/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonConversionsTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonConversionsTest.java b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonConversionsTest.java index 0daf1cc..255e033 100644 --- a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonConversionsTest.java +++ b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonConversionsTest.java @@ -19,12 +19,21 @@ package org.apache.camel.component.jackson; import java.util.HashMap; import java.util.Map; +import org.apache.camel.CamelContext; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.test.junit4.CamelTestSupport; import org.junit.Test; public class JacksonConversionsTest extends CamelTestSupport { + @Override + protected CamelContext createCamelContext() throws Exception { + CamelContext context = super.createCamelContext(); + // enable jackson type converter by setting this property on CamelContext + context.getProperties().put(JacksonConstants.ENABLE_TYPE_CONVERTER, "true"); + return context; + } + @Test public void shouldConvertMapToPojo() { String name = "someName";
