Author: davsclaus
Date: Sun Apr 29 13:34:02 2012
New Revision: 1331910
URL: http://svn.apache.org/viewvc?rev=1331910&view=rev
Log:
CAMEL-5212: Fixed tokenize XML with inherit namepace from parent, issue if
namespaces is in multiline.
Added:
camel/trunk/camel-core/src/test/java/org/apache/camel/language/TokenXMLPairMultiNamespaceSplitTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/language/TokenXMLPairNamespaceMultilineSplitTest.java
- copied, changed from r1331906,
camel/trunk/camel-core/src/test/java/org/apache/camel/language/TokenXMLPairNamespaceSplitTest.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/support/TokenXMLPairExpressionIterator.java
camel/trunk/camel-core/src/test/java/org/apache/camel/language/TokenXMLPairNamespaceSplitTest.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/support/TokenXMLPairExpressionIterator.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/support/TokenXMLPairExpressionIterator.java?rev=1331910&r1=1331909&r2=1331910&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/support/TokenXMLPairExpressionIterator.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/support/TokenXMLPairExpressionIterator.java
Sun Apr 29 13:34:02 2012
@@ -88,7 +88,8 @@ public class TokenXMLPairExpressionItera
this.inheritNamespaceToken = inheritNamespaceToken;
if (inheritNamespaceToken != null) {
token = inheritNamespaceToken.substring(0,
inheritNamespaceToken.length() - 1) + SCAN_TOKEN_REGEX;
- this.inheritNamespaceTokenPattern = Pattern.compile(token);
+ // the namespaces on the parent tag can be in multi line, so
we need to instruct the dot to support multilines
+ this.inheritNamespaceTokenPattern = Pattern.compile(token,
Pattern.MULTILINE | Pattern.DOTALL);
}
}
Added:
camel/trunk/camel-core/src/test/java/org/apache/camel/language/TokenXMLPairMultiNamespaceSplitTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/language/TokenXMLPairMultiNamespaceSplitTest.java?rev=1331910&view=auto
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/language/TokenXMLPairMultiNamespaceSplitTest.java
(added)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/language/TokenXMLPairMultiNamespaceSplitTest.java
Sun Apr 29 13:34:02 2012
@@ -0,0 +1,52 @@
+/**
+ * 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.language;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.component.mock.MockEndpoint;
+
+/**
+ *
+ */
+public class TokenXMLPairMultiNamespaceSplitTest extends
TokenXMLPairNamespaceSplitTest {
+
+ public void testTokenXMLPair() throws Exception {
+ MockEndpoint mock = getMockEndpoint("mock:split");
+ mock.expectedMessageCount(3);
+ mock.message(0).body().isEqualTo("<order id=\"1\"
xmlns=\"http:acme.com\" xmlns:foo=\"http:foo.com\">Camel in Action</order>");
+ mock.message(1).body().isEqualTo("<order id=\"2\"
xmlns=\"http:acme.com\" xmlns:foo=\"http:foo.com\">ActiveMQ in Action</order>");
+ mock.message(2).body().isEqualTo("<order id=\"3\"
xmlns=\"http:acme.com\" xmlns:foo=\"http:foo.com\">DSL in Action</order>");
+
+ String body = createBody();
+ template.sendBodyAndHeader("file:target/pair", body,
Exchange.FILE_NAME, "orders.xml");
+
+ assertMockEndpointsSatisfied();
+ }
+
+ @Override
+ protected String createBody() {
+ // multiple namespaces on parent on the same line
+ StringBuilder sb = new StringBuilder("<?xml version=\"1.0\"?>\n");
+ sb.append("<orders xmlns=\"http:acme.com\"
xmlns:foo=\"http:foo.com\">\n");
+ sb.append(" <order id=\"1\">Camel in Action</order>\n");
+ sb.append(" <order id=\"2\">ActiveMQ in Action</order>\n");
+ sb.append(" <order id=\"3\">DSL in Action</order>\n");
+ sb.append("</orders>");
+ return sb.toString();
+ }
+
+}
\ No newline at end of file
Copied:
camel/trunk/camel-core/src/test/java/org/apache/camel/language/TokenXMLPairNamespaceMultilineSplitTest.java
(from r1331906,
camel/trunk/camel-core/src/test/java/org/apache/camel/language/TokenXMLPairNamespaceSplitTest.java)
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/language/TokenXMLPairNamespaceMultilineSplitTest.java?p2=camel/trunk/camel-core/src/test/java/org/apache/camel/language/TokenXMLPairNamespaceMultilineSplitTest.java&p1=camel/trunk/camel-core/src/test/java/org/apache/camel/language/TokenXMLPairNamespaceSplitTest.java&r1=1331906&r2=1331910&rev=1331910&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/language/TokenXMLPairNamespaceSplitTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/language/TokenXMLPairNamespaceMultilineSplitTest.java
Sun Apr 29 13:34:02 2012
@@ -16,28 +16,20 @@
*/
package org.apache.camel.language;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
-import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
/**
*
*/
-public class TokenXMLPairNamespaceSplitTest extends ContextTestSupport {
-
- @Override
- protected void setUp() throws Exception {
- deleteDirectory("target/pair");
- super.setUp();
- }
+public class TokenXMLPairNamespaceMultilineSplitTest extends
TokenXMLPairNamespaceSplitTest {
public void testTokenXMLPair() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:split");
mock.expectedMessageCount(3);
- mock.message(0).body().isEqualTo("<order id=\"1\"
xmlns=\"http:acme.com\">Camel in Action</order>");
- mock.message(1).body().isEqualTo("<order id=\"2\"
xmlns=\"http:acme.com\">ActiveMQ in Action</order>");
- mock.message(2).body().isEqualTo("<order id=\"3\"
xmlns=\"http:acme.com\">DSL in Action</order>");
+ mock.message(0).body().isEqualTo("<order id=\"1\"
xmlns=\"http:acme.com\" xmlns:foo=\"http:foo.com\">Camel in Action</order>");
+ mock.message(1).body().isEqualTo("<order id=\"2\"
xmlns=\"http:acme.com\" xmlns:foo=\"http:foo.com\">ActiveMQ in Action</order>");
+ mock.message(2).body().isEqualTo("<order id=\"3\"
xmlns=\"http:acme.com\" xmlns:foo=\"http:foo.com\">DSL in Action</order>");
String body = createBody();
template.sendBodyAndHeader("file:target/pair", body,
Exchange.FILE_NAME, "orders.xml");
@@ -45,9 +37,12 @@ public class TokenXMLPairNamespaceSplitT
assertMockEndpointsSatisfied();
}
- private String createBody() {
+ @Override
+ protected String createBody() {
+ // multiple namespaces on parent on multiple lines
StringBuilder sb = new StringBuilder("<?xml version=\"1.0\"?>\n");
- sb.append("<orders xmlns=\"http:acme.com\">\n");
+ sb.append("<orders xmlns=\"http:acme.com\"\n");
+ sb.append(" xmlns:foo=\"http:foo.com\">\n");
sb.append(" <order id=\"1\">Camel in Action</order>\n");
sb.append(" <order id=\"2\">ActiveMQ in Action</order>\n");
sb.append(" <order id=\"3\">DSL in Action</order>\n");
@@ -55,18 +50,4 @@ public class TokenXMLPairNamespaceSplitT
return sb.toString();
}
- @Override
- protected RouteBuilder createRouteBuilder() throws Exception {
- return new RouteBuilder() {
- @Override
- public void configure() throws Exception {
- // START SNIPPET: e1
- from("file:target/pair")
- // split the order child tags, and inherit namespaces from
the orders root tag
- .split().tokenizeXML("order", "orders")
- .to("mock:split");
- // END SNIPPET: e1
- }
- };
- }
}
\ No newline at end of file
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/language/TokenXMLPairNamespaceSplitTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/language/TokenXMLPairNamespaceSplitTest.java?rev=1331910&r1=1331909&r2=1331910&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/language/TokenXMLPairNamespaceSplitTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/language/TokenXMLPairNamespaceSplitTest.java
Sun Apr 29 13:34:02 2012
@@ -45,7 +45,7 @@ public class TokenXMLPairNamespaceSplitT
assertMockEndpointsSatisfied();
}
- private String createBody() {
+ protected String createBody() {
StringBuilder sb = new StringBuilder("<?xml version=\"1.0\"?>\n");
sb.append("<orders xmlns=\"http:acme.com\">\n");
sb.append(" <order id=\"1\">Camel in Action</order>\n");
