Repository: camel Updated Branches: refs/heads/master c91c41d1a -> 556cf3d18
Revert the previous commit as JacksonJsonDataFormatTest extending JacksonMarshalTest does already contain the intended DSL style wording. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/556cf3d1 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/556cf3d1 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/556cf3d1 Branch: refs/heads/master Commit: 556cf3d183ec34ad92e35e36aa128b463664e62f Parents: c91c41d Author: Babak Vahdat <bvah...@apache.org> Authored: Fri Apr 3 03:24:50 2015 +0200 Committer: Babak Vahdat <bvah...@apache.org> Committed: Fri Apr 3 03:24:50 2015 +0200 ---------------------------------------------------------------------- .../component/jackson/JacksonMarshalTest.java | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/556cf3d1/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalTest.java ---------------------------------------------------------------------- diff --git a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalTest.java b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalTest.java index d394e7f..31f40b0 100644 --- a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalTest.java +++ b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalTest.java @@ -21,7 +21,6 @@ import java.util.Map; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.model.dataformat.JsonLibrary; import org.apache.camel.test.junit4.CamelTestSupport; import org.junit.Test; @@ -91,14 +90,21 @@ public class JacksonMarshalTest extends CamelTestSupport { @Override public void configure() throws Exception { - from("direct:in").marshal().json(JsonLibrary.Jackson); - from("direct:back").unmarshal().json(JsonLibrary.Jackson).to("mock:reverse"); + JacksonDataFormat format = new JacksonDataFormat(); - from("direct:inPretty").marshal().json(JsonLibrary.Jackson, true); - from("direct:backPretty").unmarshal().json(JsonLibrary.Jackson).to("mock:reverse"); + from("direct:in").marshal(format); + from("direct:back").unmarshal(format).to("mock:reverse"); - from("direct:inPojo").marshal().json(JsonLibrary.Jackson); - from("direct:backPojo").unmarshal().json(JsonLibrary.Jackson, TestPojo.class).to("mock:reversePojo"); + JacksonDataFormat prettyPrintDataFormat = new JacksonDataFormat(); + prettyPrintDataFormat.setPrettyPrint(true); + + from("direct:inPretty").marshal(prettyPrintDataFormat); + from("direct:backPretty").unmarshal(prettyPrintDataFormat).to("mock:reverse"); + + JacksonDataFormat formatPojo = new JacksonDataFormat(TestPojo.class); + + from("direct:inPojo").marshal(formatPojo); + from("direct:backPojo").unmarshal(formatPojo).to("mock:reversePojo"); } }; }
