camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject [1/3] git commit: CAMEL-7720 Support to set the DocumentBuilderFactory from the exchange property
Date Tue, 19 Aug 2014 07:45:27 GMT
Repository: camel
Updated Branches:
  refs/heads/master 4ef3d6f43 -> 2cdff24bb


CAMEL-7720 Support to set the DocumentBuilderFactory from the exchange property


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7e346f9e
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7e346f9e
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7e346f9e

Branch: refs/heads/master
Commit: 7e346f9eec0c4859db6b09e0a00dcfdd734631bb
Parents: 09627f6
Author: Willem Jiang <willem.jiang@gmail.com>
Authored: Tue Aug 19 15:28:36 2014 +0800
Committer: Willem Jiang <willem.jiang@gmail.com>
Committed: Tue Aug 19 15:29:07 2014 +0800

----------------------------------------------------------------------
 .../main/java/org/apache/camel/Exchange.java    |   3 +
 .../camel/converter/jaxp/XmlConverter.java      | 170 ++++++++++++++++---
 2 files changed, 150 insertions(+), 23 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/7e346f9e/camel-core/src/main/java/org/apache/camel/Exchange.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/Exchange.java b/camel-core/src/main/java/org/apache/camel/Exchange.java
index f8c6a90..642e9a4 100644
--- a/camel-core/src/main/java/org/apache/camel/Exchange.java
+++ b/camel-core/src/main/java/org/apache/camel/Exchange.java
@@ -104,6 +104,8 @@ public interface Exchange {
     String DESTINATION_OVERRIDE_URL = "CamelDestinationOverrideUrl";
     String DISABLE_HTTP_STREAM_CACHE = "CamelDisableHttpStreamCache";
     String DUPLICATE_MESSAGE         = "CamelDuplicateMessage";
+    
+    String DOCUMENT_BUILDER_FACTORY = "CamelDocumentBuilderFactory";
 
     String EXCEPTION_CAUGHT           = "CamelExceptionCaught";
     String EXCEPTION_HANDLED          = "CamelExceptionHandled";
@@ -199,6 +201,7 @@ public interface Exchange {
     String TRANSFER_ENCODING     = "Transfer-Encoding";
 
     String UNIT_OF_WORK_EXHAUSTED    = "CamelUnitOfWorkExhausted";
+    
     /**
      * @deprecated UNIT_OF_WORK_PROCESS_SYNC is not in use and will be removed in future
Camel release
      */

http://git-wip-us.apache.org/repos/asf/camel/blob/7e346f9e/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 0532011..2f066a0 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
@@ -69,7 +69,6 @@ import org.apache.camel.Exchange;
 import org.apache.camel.StringSource;
 import org.apache.camel.util.IOHelper;
 import org.apache.camel.util.ObjectHelper;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -288,15 +287,25 @@ public class XmlConverter {
     /**
      * Converts the source instance to a {@link DOMSource} or returns null if the conversion
is not
      * supported (making it easy to derive from this class to add new kinds of conversion).
+     * @deprecated will be removed in Camel 3.0. Use the method which has 2 parameters.
      */
-    @Converter
+    @Deprecated
     public DOMSource toDOMSource(Source source) throws ParserConfigurationException, IOException,
SAXException, TransformerException {
+        return toDOMSource(source, (Exchange)null);
+    }
+    
+    /**
+     * Converts the source instance to a {@link DOMSource} or returns null if the conversion
is not
+     * supported (making it easy to derive from this class to add new kinds of conversion).
+     */
+    @Converter
+    public DOMSource toDOMSource(Source source, Exchange exchange) throws ParserConfigurationException,
IOException, SAXException, TransformerException {
         if (source instanceof DOMSource) {
             return (DOMSource) source;
         } else if (source instanceof SAXSource) {
             return toDOMSourceFromSAX((SAXSource) source);
         } else if (source instanceof StreamSource) {
-            return toDOMSourceFromStream((StreamSource) source);
+            return toDOMSourceFromStream((StreamSource) source, exchange);
         } else if (source instanceof StAXSource) {
             return toDOMSourceFromStAX((StAXSource)source);
         } else {
@@ -561,7 +570,7 @@ public class XmlConverter {
     }
 
     @Converter
-    public SAXSource toSAXSourceFromStream(StreamSource source) {
+    public SAXSource toSAXSourceFromStream(StreamSource source) throws SAXException {
         InputSource inputSource;
         if (source.getReader() != null) {
             inputSource = new InputSource(source.getReader());
@@ -605,27 +614,52 @@ public class XmlConverter {
         return r;
     }
 
-    @Converter
+    /**
+    * @deprecated will be removed in Camel 3.0. Use the method which has 2 parameters.
+    */
+    @Deprecated
     public DOMSource toDOMSource(InputStream is) throws ParserConfigurationException, IOException,
SAXException {
+        return toDOMSource(is, (Exchange)null);
+    }
+    
+    @Converter
+    public DOMSource toDOMSource(InputStream is, Exchange exchange) throws ParserConfigurationException,
IOException, SAXException {
         InputSource source = new InputSource(is);
         String systemId = source.getSystemId();
-        DocumentBuilder builder = createDocumentBuilder();
+        DocumentBuilder builder = getDocumentBuilderFactory(exchange).newDocumentBuilder();
         Document document = builder.parse(source);
         return new DOMSource(document, systemId);
     }
 
-    @Converter
+    /**
+     * @deprecated will be removed in Camel 3.0. Use the method which has 2 parameters.
+     */
+    @Deprecated
     public DOMSource toDOMSource(File file) throws ParserConfigurationException, IOException,
SAXException {
+        return toDOMSource(file, (Exchange)null);
+    }
+    
+    @Converter
+    public DOMSource toDOMSource(File file, Exchange exchange) throws ParserConfigurationException,
IOException, SAXException {
         InputStream is = IOHelper.buffered(new FileInputStream(file));
-        return toDOMSource(is);
+        return toDOMSource(is, exchange);
     }
 
-    @Converter
+
+    /**
+     * @deprecated will be removed in Camel 3.0. Use the method which has 2 parameters.
+     */
+    @Deprecated
     public DOMSource toDOMSourceFromStream(StreamSource source) throws ParserConfigurationException,
IOException, SAXException {
+        return toDOMSourceFromStream(source, (Exchange)null);
+    }
+    
+    @Converter
+    public DOMSource toDOMSourceFromStream(StreamSource source, Exchange exchange) throws
ParserConfigurationException, IOException, SAXException {
         Document document;
         String systemId = source.getSystemId();
 
-        DocumentBuilder builder = createDocumentBuilder();
+        DocumentBuilder builder = getDocumentBuilderFactory(exchange).newDocumentBuilder();
         Reader reader = source.getReader();
         if (reader != null) {
             document = builder.parse(new InputSource(reader));
@@ -754,15 +788,28 @@ public class XmlConverter {
         }
     }
 
+    
     /**
      * Converts the given data to a DOM document
      *
      * @param data is the data to be parsed
      * @return the parsed document
      */
-    @Converter
+    @Deprecated
     public Document toDOMDocument(byte[] data) throws IOException, SAXException, ParserConfigurationException
{
-        DocumentBuilder documentBuilder = getDocumentBuilderFactory().newDocumentBuilder();
+        return toDOMDocument(data, (Exchange)null);
+    }
+    
+    /**
+     * Converts the given data to a DOM document
+     *
+     * @param data is the data to be parsed
+     * @param exchange is the exchange to be used when calling the converter
+     * @return the parsed document
+     */
+    @Converter
+    public Document toDOMDocument(byte[] data, Exchange exchange) throws IOException, SAXException,
ParserConfigurationException {
+        DocumentBuilder documentBuilder = getDocumentBuilderFactory(exchange).newDocumentBuilder();
         return documentBuilder.parse(new ByteArrayInputStream(data));
     }
 
@@ -771,10 +818,23 @@ public class XmlConverter {
      *
      * @param in is the data to be parsed
      * @return the parsed document
+     * @deprecated will be removed in Camel 3.0. Use the method which has 2 parameters.
      */
-    @Converter
+    @Deprecated
     public Document toDOMDocument(InputStream in) throws IOException, SAXException, ParserConfigurationException
{
-        DocumentBuilder documentBuilder = getDocumentBuilderFactory().newDocumentBuilder();
+        return toDOMDocument(in, (Exchange)null);
+    }
+    
+    /**
+     * Converts the given {@link InputStream} to a DOM document
+     *
+     * @param in is the data to be parsed
+     * @param exchange is the exchange to be used when calling the converter
+     * @return the parsed document
+     */
+    @Converter
+    public Document toDOMDocument(InputStream in, Exchange exchange) throws IOException,
SAXException, ParserConfigurationException {
+        DocumentBuilder documentBuilder = getDocumentBuilderFactory(exchange).newDocumentBuilder();
         return documentBuilder.parse(in);
     }
 
@@ -783,21 +843,47 @@ public class XmlConverter {
      *
      * @param in is the data to be parsed
      * @return the parsed document
+     * @deprecated will be removed in Camel 3.0. Use the method which has 2 parameters.
      */
-    @Converter
+    @Deprecated
     public Document toDOMDocument(Reader in) throws IOException, SAXException, ParserConfigurationException
{
         return toDOMDocument(new InputSource(in));
     }
+    
+    /**
+     * Converts the given {@link InputStream} to a DOM document
+     *
+     * @param in is the data to be parsed
+     * @param exchange is the exchange to be used when calling the converter
+     * @return the parsed document
+     */
+    @Converter
+    public Document toDOMDocument(Reader in, Exchange exchange) throws IOException, SAXException,
ParserConfigurationException {
+        return toDOMDocument(new InputSource(in), exchange);
+    }
 
     /**
      * Converts the given {@link InputSource} to a DOM document
      *
      * @param in is the data to be parsed
      * @return the parsed document
+     * @deprecated will be removed in Camel 3.0. Use the method which has 2 parameters.
      */
-    @Converter
+    @Deprecated
     public Document toDOMDocument(InputSource in) throws IOException, SAXException, ParserConfigurationException
{
-        DocumentBuilder documentBuilder = getDocumentBuilderFactory().newDocumentBuilder();
+        return toDOMDocument(in, (Exchange)null);
+    }
+    
+    /**
+     * Converts the given {@link InputSource} to a DOM document
+     *
+     * @param in is the data to be parsed
+     * @param exchange is the exchange to be used when calling the converter
+     * @return the parsed document
+     */
+    @Converter
+    public Document toDOMDocument(InputSource in, Exchange exchange) throws IOException,
SAXException, ParserConfigurationException {
+        DocumentBuilder documentBuilder = getDocumentBuilderFactory(exchange).newDocumentBuilder();
         return documentBuilder.parse(in);
     }
 
@@ -806,21 +892,47 @@ public class XmlConverter {
      *
      * @param text is the data to be parsed
      * @return the parsed document
+     * @deprecated will be removed in Camel 3.0. Use the method which has 2 parameters.
      */
-    @Converter
+    @Deprecated
     public Document toDOMDocument(String text) throws IOException, SAXException, ParserConfigurationException
{
         return toDOMDocument(new StringReader(text));
     }
+    
+    /**
+     * Converts the given {@link String} to a DOM document
+     *
+     * @param text is the data to be parsed
+     * @param exchange is the exchange to be used when calling the converter
+     * @return the parsed document
+     */
+    @Converter
+    public Document toDOMDocument(String text, Exchange exchange) throws IOException, SAXException,
ParserConfigurationException {
+        return toDOMDocument(new StringReader(text), exchange);
+    }
 
     /**
      * Converts the given {@link File} to a DOM document
      *
      * @param file is the data to be parsed
      * @return the parsed document
+     * @deprecated will be removed in Camel 3.0. Use the method which has 2 parameters.
      */
-    @Converter
+    @Deprecated
     public Document toDOMDocument(File file) throws IOException, SAXException, ParserConfigurationException
{
-        DocumentBuilder documentBuilder = getDocumentBuilderFactory().newDocumentBuilder();
+        return toDOMDocument(file, (Exchange)null);
+    }
+    
+    /**
+     * Converts the given {@link File} to a DOM document
+     *
+     * @param file is the data to be parsed
+     * @param exchange is the exchange to be used when calling the converter
+     * @return the parsed document
+     */
+    @Converter
+    public Document toDOMDocument(File file, Exchange exchange) throws IOException, SAXException,
ParserConfigurationException {
+        DocumentBuilder documentBuilder = getDocumentBuilderFactory(exchange).newDocumentBuilder();
         return documentBuilder.parse(file);
     }
 
@@ -962,7 +1074,19 @@ public class XmlConverter {
         }
 
     }
-
+    
+    public DocumentBuilderFactory getDocumentBuilderFactory(Exchange exchange) {
+        DocumentBuilderFactory answer = getDocumentBuilderFactory();
+        // Get the DocumentBuilderFactory from the exchange header first
+        if (exchange != null) {
+            DocumentBuilderFactory factory = exchange.getProperty(Exchange.DOCUMENT_BUILDER_FACTORY,
DocumentBuilderFactory.class);
+            if (factory != null) {
+                answer = factory;
+            }
+        }
+        return answer;
+    }
+ 
     public DocumentBuilderFactory createDocumentBuilderFactory() {
         DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
         factory.setNamespaceAware(true);
@@ -984,8 +1108,8 @@ public class XmlConverter {
                 factory.setAttribute("http://apache.org/xml/properties/security-manager",
sm);
             }
         } catch (Exception e) {
-            LOG.warn("DocumentBuilderFactory doesn't support the attribute {} with value
{}, due to {}."
-                     , new Object[]{"http://apache.org/xml/properties/security-manager",
true, e});
+            LOG.warn("DocumentBuilderFactory doesn't support the attribute {}, due to {}."
+                     , new Object[]{"http://apache.org/xml/properties/security-manager",
e});
         }
         // setup the feature from the system property
         setupFeatures(factory);


Mime
View raw message