You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ha...@apache.org on 2013/12/06 19:35:40 UTC
git commit: CS fixes
Updated Branches:
refs/heads/camel-2.11.x db644f9d7 -> c2e5d8ecf
CS fixes
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c2e5d8ec
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c2e5d8ec
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c2e5d8ec
Branch: refs/heads/camel-2.11.x
Commit: c2e5d8ecf6f3bca2ab7208f3e476101a6babc30f
Parents: db644f9
Author: Hadrian Zbarcea <hz...@gmail.com>
Authored: Fri Dec 6 13:35:19 2013 -0500
Committer: Hadrian Zbarcea <hz...@gmail.com>
Committed: Fri Dec 6 13:35:19 2013 -0500
----------------------------------------------------------------------
.../org/apache/camel/converter/jaxp/XmlConverter.java | 2 +-
.../camel/language/tokenizer/TokenizeLanguageTest.java | 12 +++++++-----
.../camel/util/DumpModelAsXmlTransformRouteTest.java | 9 +++++----
3 files changed, 13 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/c2e5d8ec/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java b/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java
index dec34f6..487314a 100644
--- a/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java
+++ b/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java
@@ -935,7 +935,7 @@ public class XmlConverter {
if (features.size() > 0) {
StringBuffer featureString = new StringBuffer();
// just log the configured feature
- for (String feature: features) {
+ for (String feature : features) {
if (featureString.length() != 0) {
featureString.append(", ");
}
http://git-wip-us.apache.org/repos/asf/camel/blob/c2e5d8ec/camel-core/src/test/java/org/apache/camel/language/tokenizer/TokenizeLanguageTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/language/tokenizer/TokenizeLanguageTest.java b/camel-core/src/test/java/org/apache/camel/language/tokenizer/TokenizeLanguageTest.java
index 1860436..4dc3c38 100644
--- a/camel-core/src/test/java/org/apache/camel/language/tokenizer/TokenizeLanguageTest.java
+++ b/camel-core/src/test/java/org/apache/camel/language/tokenizer/TokenizeLanguageTest.java
@@ -66,10 +66,12 @@ public class TokenizeLanguageTest extends ContextTestSupport {
public void testSendMixedClosingTagInsideMessageToTokenize() throws Exception {
getMockEndpoint("mock:result").expectedBodiesReceived(
- "<child name='child1'><grandchild name='grandchild1'/> <grandchild name='grandchild2'/></child>", "<child name='child2'><grandchild name='grandchild1'></grandchild><grandchild name='grandchild2'></grandchild></child>");
+ "<child name='child1'><grandchild name='grandchild1'/><grandchild name='grandchild2'/></child>",
+ "<child name='child2'><grandchild name='grandchild1'></grandchild><grandchild name='grandchild2'></grandchild></child>");
- template.sendBody("direct:start",
- "<parent><child name='child1'><grandchild name='grandchild1'/> <grandchild name='grandchild2'/></child><child name='child2'><grandchild name='grandchild1'></grandchild><grandchild name='grandchild2'></grandchild></child></parent>");
+ template.sendBody("direct:start", "<?xml version='1.0' encoding='UTF-8'?>"
+ + "<parent><child name='child1'><grandchild name='grandchild1'/><grandchild name='grandchild2'/></child>"
+ + "<child name='child2'><grandchild name='grandchild1'></grandchild><grandchild name='grandchild2'></grandchild></child></parent>");
assertMockEndpointsSatisfied();
}
@@ -78,8 +80,8 @@ public class TokenizeLanguageTest extends ContextTestSupport {
getMockEndpoint("mock:result").expectedBodiesReceived(
"<c:child xmlns:c='urn:c' some_attr='a' anotherAttr='a'></c:child>", "<c:child xmlns:c='urn:c' some_attr='b' anotherAttr='b' />");
- template.sendBody("direct:start",
- "<?xml version='1.0' encoding='UTF-8'?><parent><c:child xmlns:c='urn:c' some_attr='a' anotherAttr='a'></c:child><c:child xmlns:c='urn:c' some_attr='b' anotherAttr='b' /></parent>");
+ template.sendBody("direct:start", "<?xml version='1.0' encoding='UTF-8'?>"
+ + "<parent><c:child xmlns:c='urn:c' some_attr='a' anotherAttr='a'></c:child><c:child xmlns:c='urn:c' some_attr='b' anotherAttr='b' /></parent>");
assertMockEndpointsSatisfied();
}
http://git-wip-us.apache.org/repos/asf/camel/blob/c2e5d8ec/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlTransformRouteTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlTransformRouteTest.java b/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlTransformRouteTest.java
index e58d68d..09aa16f 100644
--- a/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlTransformRouteTest.java
+++ b/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlTransformRouteTest.java
@@ -16,15 +16,16 @@
*/
package org.apache.camel.util;
-import org.apache.camel.ContextTestSupport;
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.converter.jaxp.XmlConverter;
-import org.apache.camel.model.ModelHelper;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.converter.jaxp.XmlConverter;
+import org.apache.camel.model.ModelHelper;
+
/**
*
*/