Repository: camel Updated Branches: refs/heads/master c67392fe1 -> c91c41d1a
Fixed the CS error of camel-gson and camel-xstream Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c91c41d1 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c91c41d1 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c91c41d1 Branch: refs/heads/master Commit: c91c41d1af2f05ae9827cc5960129e422860d480 Parents: 3c3b0ed Author: Willem Jiang <willem.ji...@gmail.com> Authored: Fri Apr 3 09:20:00 2015 +0800 Committer: Willem Jiang <willem.ji...@gmail.com> Committed: Fri Apr 3 09:20:31 2015 +0800 ---------------------------------------------------------------------- .../component/gson/SpringGsonJsonDataFormatTest.java | 6 +++--- .../dataformat/xstream/MarshalDomainObjectJSONTest.java | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/c91c41d1/components/camel-gson/src/test/java/org/apache/camel/component/gson/SpringGsonJsonDataFormatTest.java ---------------------------------------------------------------------- diff --git a/components/camel-gson/src/test/java/org/apache/camel/component/gson/SpringGsonJsonDataFormatTest.java b/components/camel-gson/src/test/java/org/apache/camel/component/gson/SpringGsonJsonDataFormatTest.java index cece6fd..751f99b 100644 --- a/components/camel-gson/src/test/java/org/apache/camel/component/gson/SpringGsonJsonDataFormatTest.java +++ b/components/camel-gson/src/test/java/org/apache/camel/component/gson/SpringGsonJsonDataFormatTest.java @@ -58,9 +58,9 @@ public class SpringGsonJsonDataFormatTest extends CamelSpringTestSupport { Object marshalled = template.requestBody("direct:inPretty", in); String marshalledAsString = context.getTypeConverter().convertTo(String.class, marshalled); - String expected = "{\n" + - " \"name\": \"Camel\"" + - "\n}"; + String expected = "{\n" + + " \"name\": \"Camel\"" + + "\n}"; assertEquals(expected, marshalledAsString); template.sendBody("direct:backPretty", marshalled); http://git-wip-us.apache.org/repos/asf/camel/blob/c91c41d1/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/MarshalDomainObjectJSONTest.java ---------------------------------------------------------------------- diff --git a/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/MarshalDomainObjectJSONTest.java b/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/MarshalDomainObjectJSONTest.java index 6c3cdac..55fbdf0 100644 --- a/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/MarshalDomainObjectJSONTest.java +++ b/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/MarshalDomainObjectJSONTest.java @@ -37,11 +37,11 @@ public class MarshalDomainObjectJSONTest extends MarshalDomainObjectTest { Object marshalled = template.requestBody("direct:inPretty", order); String marshalledAsString = context.getTypeConverter().convertTo(String.class, marshalled); // the line-separator used by JsonWriter is "\n", even on windows - String expected = "{\"org.apache.camel.dataformat.xstream.PurchaseOrder\": {\n" + - " \"name\": \"pretty printed Camel\",\n"+ - " \"price\": 7.91,\n" + - " \"amount\": 1.0\n" + - "}}"; + String expected = "{\"org.apache.camel.dataformat.xstream.PurchaseOrder\": {\n" + + " \"name\": \"pretty printed Camel\",\n" + + " \"price\": 7.91,\n" + + " \"amount\": 1.0\n" + + "}}"; assertEquals(expected, marshalledAsString); template.sendBody("direct:backPretty", marshalled);
