CAMEL-10029 update default unmarshall type to java.lang.Object instead of java.util.Map to be able to unmarshall any valid Json document with the default configuration of Jackson unmarshaller
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/bd14ebdc Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/bd14ebdc Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/bd14ebdc Branch: refs/heads/master Commit: bd14ebdc31b0768b8d54b52fa36cf1b58facba70 Parents: 48e5785 Author: apailhes <adrien.pail...@adioss.fr> Authored: Tue Jun 7 18:59:01 2016 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Wed Jun 8 14:57:21 2016 +0200 ---------------------------------------------------------------------- .../component/jackson/JacksonDataFormat.java | 2 +- .../jackson/JacksonDataFormatTest.java | 57 ++++++++++++++++++++ 2 files changed, 58 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/bd14ebdc/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 947eac6..ab142bb 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 @@ -73,7 +73,7 @@ public class JacksonDataFormat extends ServiceSupport implements DataFormat, Dat * Use the default Jackson {@link ObjectMapper} and {@link Map} */ public JacksonDataFormat() { - this(HashMap.class); + this(Object.class); } /** http://git-wip-us.apache.org/repos/asf/camel/blob/bd14ebdc/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonDataFormatTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonDataFormatTest.java b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonDataFormatTest.java new file mode 100644 index 0000000..01dc521 --- /dev/null +++ b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonDataFormatTest.java @@ -0,0 +1,57 @@ +/** + * 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.jackson; + +import java.io.ByteArrayInputStream; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.Collections; + +import org.apache.camel.impl.DefaultCamelContext; +import org.apache.camel.impl.DefaultExchange; +import org.junit.Test; + +import static org.junit.Assert.assertEquals; + +public class JacksonDataFormatTest { + @Test + public void testString() throws Exception { + testJson("\"A string\"", "A string"); + } + + @Test + public void testMap() throws Exception { + testJson("{\"value\":123}", Collections.singletonMap("value", 123)); + } + + @Test + public void testList() throws Exception { + testJson("[{\"value\":123}]", new ArrayList<>(Collections.singletonList(Collections.singletonMap("value", 123)))); + + } + + private void testJson(String json, Object expected) throws Exception { + Object unmarshalled; + JacksonDataFormat gsonDataFormat = new JacksonDataFormat(); + gsonDataFormat.doStart(); + try (InputStream in = new ByteArrayInputStream(json.getBytes())) { + unmarshalled = gsonDataFormat.unmarshal(new DefaultExchange(new DefaultCamelContext()), in); + } + + assertEquals(expected, unmarshalled); + } +} \ No newline at end of file
