Improvement for character escape handling https://issues.apache.org/jira/browse/CAMEL-10219
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/38a5eb93 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/38a5eb93 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/38a5eb93 Branch: refs/heads/master Commit: 38a5eb934efe2f479282469be2b593f3d93b20a2 Parents: ebf97e3 Author: Siddharth Sharma <siddharth.sha...@jobvite-inc.com> Authored: Thu Aug 4 13:50:52 2016 -0700 Committer: Claus Ibsen <davscl...@apache.org> Committed: Mon Aug 8 08:00:53 2016 +0200 ---------------------------------------------------------------------- .../camel/converter/jaxb/JaxbConstants.java | 30 ++++++++++++++++++++ .../camel/converter/jaxb/JaxbDataFormat.java | 18 ++++++++++++ 2 files changed, 48 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/38a5eb93/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbConstants.java ---------------------------------------------------------------------- diff --git a/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbConstants.java b/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbConstants.java new file mode 100644 index 0000000..feba22c --- /dev/null +++ b/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbConstants.java @@ -0,0 +1,30 @@ +/** + * 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.converter.jaxb; + +/** + * Constants used by Camel Jaxb module + * + * @author Siddharth Sharma + * @since Aug 4, 2016 + * + */ +public interface JaxbConstants { + + String JAXB_ESCAPE_HANDLER = "CamelJaxbCharacterEscapeHandler"; + +} http://git-wip-us.apache.org/repos/asf/camel/blob/38a5eb93/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbDataFormat.java ---------------------------------------------------------------------- diff --git a/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbDataFormat.java b/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbDataFormat.java index d66c7c5..31aadf5 100644 --- a/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbDataFormat.java +++ b/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbDataFormat.java @@ -64,6 +64,8 @@ import org.apache.camel.util.ResourceHelper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.sun.xml.bind.marshaller.CharacterEscapeHandler; + /** * A <a href="http://camel.apache.org/data-format.html";>data format</a> ({@link DataFormat}) * using JAXB2 to marshal to and from XML @@ -101,6 +103,7 @@ public class JaxbDataFormat extends ServiceSupport implements DataFormat, DataFo private JaxbXmlStreamWriterWrapper xmlStreamWriterWrapper; private TypeConverter typeConverter; private Schema cachedSchema; + private CharacterEscapeHandler escapeHandler; public JaxbDataFormat() { } @@ -146,6 +149,13 @@ public class JaxbDataFormat extends ServiceSupport implements DataFormat, DataFo if (namespacePrefixMapper != null) { marshaller.setProperty(namespacePrefixMapper.getRegistrationKey(), namespacePrefixMapper); } + CharacterEscapeHandler escapeHandlerObject = exchange.getProperty(JaxbConstants.JAXB_ESCAPE_HANDLER, CharacterEscapeHandler.class); + if(escapeHandlerObject == null) { + escapeHandlerObject = getEscapeHandler(); + } + if(escapeHandlerObject != null) { + marshaller.setProperty(CharacterEscapeHandler.class.getName(),escapeHandlerObject); + } marshal(exchange, graph, stream, marshaller); @@ -536,4 +546,12 @@ public class JaxbDataFormat extends ServiceSupport implements DataFormat, DataFo SCHEMA_FACTORY_POOL.offer(factory); } } + + public CharacterEscapeHandler getEscapeHandler() { + return escapeHandler; + } + + public void setEscapeHandler(CharacterEscapeHandler escapeHandler) { + this.escapeHandler = escapeHandler; + } }
