You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2017/09/07 15:02:41 UTC
[2/3] camel git commit: CAMEL-11723: dump model as xml should use
utf-8 encoding as input and output so the parsing is consistent regardless of
default system encoding and when end user use special chars in the route
descriptions.
CAMEL-11723: dump model as xml should use utf-8 encoding as input and output so the parsing is consistent regardless of default system encoding and when end user use special chars in the route descriptions.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/af50c0e9
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/af50c0e9
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/af50c0e9
Branch: refs/heads/camel-2.19.x
Commit: af50c0e958362b401c181411d909c9bd67ac5dff
Parents: efad039
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Sep 7 17:01:47 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Sep 7 17:02:09 2017 +0200
----------------------------------------------------------------------
.../management/mbean/ManagedCamelContext.java | 4 +-
.../camel/management/mbean/ManagedRoute.java | 2 +-
.../org/apache/camel/model/ModelHelper.java | 2 +
.../DumpModelAsXmlDanishCharactersTest.java | 59 ++++++++++++++++++++
4 files changed, 64 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/af50c0e9/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java
index 3d5d419..098b834 100644
--- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java
+++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java
@@ -394,7 +394,7 @@ public class ManagedCamelContext extends ManagedPerformanceCounter implements Ti
// if resolving placeholders we parse the xml, and resolve the property placeholders during parsing
if (resolvePlaceholders) {
final AtomicBoolean changed = new AtomicBoolean();
- InputStream is = new ByteArrayInputStream(xml.getBytes());
+ InputStream is = new ByteArrayInputStream(xml.getBytes("UTF-8"));
Document dom = XmlLineNumberParser.parseXml(is, new XmlLineNumberParser.XmlTextTransformer() {
@Override
public String transform(String text) {
@@ -440,7 +440,7 @@ public class ManagedCamelContext extends ManagedPerformanceCounter implements Ti
// if resolving placeholders we parse the xml, and resolve the property placeholders during parsing
if (resolvePlaceholders) {
final AtomicBoolean changed = new AtomicBoolean();
- InputStream is = new ByteArrayInputStream(xml.getBytes());
+ InputStream is = new ByteArrayInputStream(xml.getBytes("UTF-8"));
Document dom = XmlLineNumberParser.parseXml(is, new XmlLineNumberParser.XmlTextTransformer() {
@Override
public String transform(String text) {
http://git-wip-us.apache.org/repos/asf/camel/blob/af50c0e9/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRoute.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRoute.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRoute.java
index b0fca83..3112c47 100644
--- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRoute.java
+++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedRoute.java
@@ -285,7 +285,7 @@ public class ManagedRoute extends ManagedPerformanceCounter implements TimerList
// if resolving placeholders we parse the xml, and resolve the property placeholders during parsing
if (resolvePlaceholders) {
final AtomicBoolean changed = new AtomicBoolean();
- InputStream is = new ByteArrayInputStream(xml.getBytes());
+ InputStream is = new ByteArrayInputStream(xml.getBytes("UTF-8"));
Document dom = XmlLineNumberParser.parseXml(is, new XmlLineNumberParser.XmlTextTransformer() {
@Override
public String transform(String text) {
http://git-wip-us.apache.org/repos/asf/camel/blob/af50c0e9/camel-core/src/main/java/org/apache/camel/model/ModelHelper.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/ModelHelper.java b/camel-core/src/main/java/org/apache/camel/model/ModelHelper.java
index 373d231..0bc123b 100644
--- a/camel-core/src/main/java/org/apache/camel/model/ModelHelper.java
+++ b/camel-core/src/main/java/org/apache/camel/model/ModelHelper.java
@@ -81,6 +81,7 @@ public final class ModelHelper {
Marshaller marshaller = jaxbContext.createMarshaller();
marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE);
+ marshaller.setProperty(Marshaller.JAXB_ENCODING, "UTF-8");
StringWriter buffer = new StringWriter();
marshaller.marshal(definition, buffer);
@@ -104,6 +105,7 @@ public final class ModelHelper {
Properties outputProperties = new Properties();
outputProperties.put(OutputKeys.INDENT, "yes");
outputProperties.put(OutputKeys.STANDALONE, "yes");
+ outputProperties.put(OutputKeys.ENCODING, "UTF-8");
try {
return xmlConverter.toStringFromDocument(dom, outputProperties);
} catch (TransformerException e) {
http://git-wip-us.apache.org/repos/asf/camel/blob/af50c0e9/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlDanishCharactersTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlDanishCharactersTest.java b/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlDanishCharactersTest.java
new file mode 100644
index 0000000..cf07cc5
--- /dev/null
+++ b/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlDanishCharactersTest.java
@@ -0,0 +1,59 @@
+/**
+ * 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.util;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.MyBarSingleton;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.impl.JndiRegistry;
+import org.apache.camel.model.ModelHelper;
+
+/**
+ *
+ */
+public class DumpModelAsXmlDanishCharactersTest extends ContextTestSupport {
+
+ @Override
+ protected JndiRegistry createRegistry() throws Exception {
+ JndiRegistry jndi = super.createRegistry();
+ jndi.bind("myCoolBean", new MyBarSingleton());
+ return jndi;
+ }
+
+ public void testDumpModelAsXml() throws Exception {
+ String xml = ModelHelper.dumpModelAsXml(context, context.getRouteDefinition("myRoute"));
+ assertNotNull(xml);
+ log.info(xml);
+
+ assertTrue(xml.contains("<simple>Hello ${body}</simple>"));
+ assertTrue(xml.contains("<description>Hello danish \u00C6\u00D8\u00C5</description>"));
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ from("direct:start").routeId("myRoute")
+ .description("Hello danish \u00C6\u00D8\u00C5")
+ .setBody(simple("Hello ${body}"))
+ .to("mock:result");
+ }
+ };
+ }
+
+}