Return-Path: Delivered-To: apmail-camel-commits-archive@www.apache.org Received: (qmail 45513 invoked from network); 18 Feb 2011 06:58:07 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 18 Feb 2011 06:58:07 -0000 Received: (qmail 96606 invoked by uid 500); 18 Feb 2011 06:58:07 -0000 Delivered-To: apmail-camel-commits-archive@camel.apache.org Received: (qmail 96550 invoked by uid 500); 18 Feb 2011 06:58:04 -0000 Mailing-List: contact commits-help@camel.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@camel.apache.org Delivered-To: mailing list commits@camel.apache.org Received: (qmail 96543 invoked by uid 99); 18 Feb 2011 06:58:04 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 18 Feb 2011 06:58:04 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 18 Feb 2011 06:58:02 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 0055223889E9; Fri, 18 Feb 2011 06:57:40 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1071901 - in /camel/trunk/camel-core/src: main/java/org/apache/camel/converter/jaxp/XmlConverter.java test/java/org/apache/camel/converter/jaxp/XmlConverterTest.java Date: Fri, 18 Feb 2011 06:57:40 -0000 To: commits@camel.apache.org From: davsclaus@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110218065741.0055223889E9@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: davsclaus Date: Fri Feb 18 06:57:40 2011 New Revision: 1071901 URL: http://svn.apache.org/viewvc?rev=1071901&view=rev Log: CAMEL-3681: Added byte[] to DOMSource converter. Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java camel/trunk/camel-core/src/test/java/org/apache/camel/converter/jaxp/XmlConverterTest.java Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java?rev=1071901&r1=1071900&r2=1071901&view=diff ============================================================================== --- camel/trunk/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java (original) +++ camel/trunk/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java Fri Feb 18 06:57:40 2011 @@ -54,6 +54,7 @@ import org.xml.sax.XMLReader; import org.apache.camel.Converter; import org.apache.camel.Exchange; +import org.apache.camel.util.IOHelper; import org.apache.camel.util.ObjectHelper; /** @@ -286,7 +287,21 @@ 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). + */ + @Converter + public DOMSource toDOMSource(byte[] bytes) throws IOException, SAXException, ParserConfigurationException { + InputStream is = new ByteArrayInputStream(bytes); + try { + return toDOMSource(is); + } finally { + IOHelper.close(is); + } + } + + /** * Converts the source instance to a {@link SAXSource} or returns null if the conversion is not * supported (making it easy to derive from this class to add new kinds of conversion). Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/converter/jaxp/XmlConverterTest.java URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/converter/jaxp/XmlConverterTest.java?rev=1071901&r1=1071900&r2=1071901&view=diff ============================================================================== --- camel/trunk/camel-core/src/test/java/org/apache/camel/converter/jaxp/XmlConverterTest.java (original) +++ camel/trunk/camel-core/src/test/java/org/apache/camel/converter/jaxp/XmlConverterTest.java Fri Feb 18 06:57:40 2011 @@ -116,6 +116,17 @@ public class XmlConverterTest extends Co assertSame(source, out); } + public void testToDomSourceByByteArray() throws Exception { + XmlConverter conv = new XmlConverter(); + + byte[] bytes = "bar".getBytes(); + DOMSource source = conv.toDOMSource(bytes); + assertNotNull(source); + + byte[] out = conv.toByteArray(source, null); + assertEquals(new String(bytes), new String(out)); + } + public void testToDomSourceByStaxSource() throws Exception { XmlConverter conv = new XmlConverter();