Author: ningjiang Date: Fri Dec 18 02:12:12 2009 New Revision: 892109 URL: http://svn.apache.org/viewvc?rev=892109&view=rev Log: CAMEL-2148 Added DataFormat for Google Protocol Buffers
Added: camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/ProtobufDataFormat.java (with props) camel/trunk/components/camel-protobuf/ camel/trunk/components/camel-protobuf/pom.xml (with props) camel/trunk/components/camel-protobuf/src/ camel/trunk/components/camel-protobuf/src/main/ camel/trunk/components/camel-protobuf/src/main/java/ camel/trunk/components/camel-protobuf/src/main/java/org/ camel/trunk/components/camel-protobuf/src/main/java/org/apache/ camel/trunk/components/camel-protobuf/src/main/java/org/apache/camel/ camel/trunk/components/camel-protobuf/src/main/java/org/apache/camel/dataformat/ camel/trunk/components/camel-protobuf/src/main/java/org/apache/camel/dataformat/protobuf/ camel/trunk/components/camel-protobuf/src/main/java/org/apache/camel/dataformat/protobuf/ProtobufDataFormat.java (with props) camel/trunk/components/camel-protobuf/src/main/resources/ camel/trunk/components/camel-protobuf/src/main/resources/META-INF/ camel/trunk/components/camel-protobuf/src/main/resources/META-INF/LICENSE.txt (with props) camel/trunk/components/camel-protobuf/src/main/resources/META-INF/NOTICE.txt (with props) camel/trunk/components/camel-protobuf/src/main/resources/META-INF/services/ camel/trunk/components/camel-protobuf/src/main/resources/META-INF/services/org/ camel/trunk/components/camel-protobuf/src/main/resources/META-INF/services/org/apache/ camel/trunk/components/camel-protobuf/src/main/resources/META-INF/services/org/apache/camel/ camel/trunk/components/camel-protobuf/src/main/resources/META-INF/services/org/apache/camel/dataformat/ camel/trunk/components/camel-protobuf/src/main/resources/META-INF/services/org/apache/camel/dataformat/protobuf camel/trunk/components/camel-protobuf/src/test/ camel/trunk/components/camel-protobuf/src/test/java/ camel/trunk/components/camel-protobuf/src/test/java/org/ camel/trunk/components/camel-protobuf/src/test/java/org/apache/ camel/trunk/components/camel-protobuf/src/test/java/org/apache/camel/ camel/trunk/components/camel-protobuf/src/test/java/org/apache/camel/dataformat/ camel/trunk/components/camel-protobuf/src/test/java/org/apache/camel/dataformat/protobuf/ camel/trunk/components/camel-protobuf/src/test/java/org/apache/camel/dataformat/protobuf/ProtobufMarshalTest.java (with props) camel/trunk/components/camel-protobuf/src/test/java/org/apache/camel/dataformat/protobuf/generated/ camel/trunk/components/camel-protobuf/src/test/java/org/apache/camel/dataformat/protobuf/generated/AddressBookProtos.java (with props) camel/trunk/components/camel-protobuf/src/test/resources/ camel/trunk/components/camel-protobuf/src/test/resources/addressbook.proto (with props) camel/trunk/components/camel-protobuf/src/test/resources/readme.txt (with props) Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java camel/trunk/camel-core/src/main/resources/org/apache/camel/model/dataformat/jaxb.index Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java?rev=892109&r1=892108&r2=892109&view=diff ============================================================================== --- camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java (original) +++ camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java Fri Dec 18 02:12:12 2009 @@ -31,6 +31,7 @@ import org.apache.camel.model.dataformat.JaxbDataFormat; import org.apache.camel.model.dataformat.JsonDataFormat; import org.apache.camel.model.dataformat.JsonLibrary; +import org.apache.camel.model.dataformat.ProtobufDataFormat; import org.apache.camel.model.dataformat.RssDataFormat; import org.apache.camel.model.dataformat.SerializationDataFormat; import org.apache.camel.model.dataformat.StringDataFormat; @@ -178,6 +179,17 @@ json.setUnmarshalType(unmarshalType); return dataFormat(json); } + + /** + * Uses the protobuf data format + */ + public T protobuf() { + return dataFormat(new ProtobufDataFormat()); + } + + public T protobuf(String instanceClassName) { + return dataFormat(new ProtobufDataFormat(instanceClassName)); + } /** * Uses the RSS data format Added: camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/ProtobufDataFormat.java URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/ProtobufDataFormat.java?rev=892109&view=auto ============================================================================== --- camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/ProtobufDataFormat.java (added) +++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/ProtobufDataFormat.java Fri Dec 18 02:12:12 2009 @@ -0,0 +1,61 @@ +/** + * 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.model.dataformat; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlRootElement; + +import org.apache.camel.model.DataFormatDefinition; +import org.apache.camel.spi.DataFormat; +import org.apache.camel.util.ObjectHelper; + + +/** + * Represents a protobuf DataFormat {...@link org.apache.camel.spi.DataFormat} + * + * @version $Revision$ + */ + +...@xmlrootelement(name = "protobuf") +...@xmlaccessortype(XmlAccessType.FIELD) +public class ProtobufDataFormat extends DataFormatDefinition { + @XmlAttribute(required = false) + private String instanceClass; + + public ProtobufDataFormat() { + super("protobuf"); + } + + public ProtobufDataFormat(String instanceClass) { + this(); + setInstanceClass(instanceClass); + } + + public void setInstanceClass(String instanceClass) { + this.instanceClass = instanceClass; + } + + @Override + protected void configureDataFormat(DataFormat dataFormat) { + if (this.instanceClass != null) { + setProperty(dataFormat, "instanceClass", instanceClass); + } + } + +} Propchange: camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/ProtobufDataFormat.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/ProtobufDataFormat.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Modified: camel/trunk/camel-core/src/main/resources/org/apache/camel/model/dataformat/jaxb.index URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/resources/org/apache/camel/model/dataformat/jaxb.index?rev=892109&r1=892108&r2=892109&view=diff ============================================================================== --- camel/trunk/camel-core/src/main/resources/org/apache/camel/model/dataformat/jaxb.index (original) +++ camel/trunk/camel-core/src/main/resources/org/apache/camel/model/dataformat/jaxb.index Fri Dec 18 02:12:12 2009 @@ -25,6 +25,7 @@ JaxbDataFormat JsonDataFormat JsonLibrary +ProtobufDataFormat RssDataFormat SerializationDataFormat StringDataFormat Added: camel/trunk/components/camel-protobuf/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-protobuf/pom.xml?rev=892109&view=auto ============================================================================== --- camel/trunk/components/camel-protobuf/pom.xml (added) +++ camel/trunk/components/camel-protobuf/pom.xml Fri Dec 18 02:12:12 2009 @@ -0,0 +1,39 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.apache.camel</groupId> + <artifactId>camel-parent</artifactId> + <version>2.2-SNAPSHOT</version> + </parent> + + <groupId>org.apache.camel</groupId> + <artifactId>camel-protobuf</artifactId> + <packaging>jar</packaging> + <name>camel-protobuf</name> + + <dependencies> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-core</artifactId> + </dependency> + <dependency> + <groupId>com.google.protobuf</groupId> + <artifactId>protobuf-java</artifactId> + <version>2.2.0</version> + </dependency> + + <!-- testing --> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-test</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + </dependencies> +</project> Propchange: camel/trunk/components/camel-protobuf/pom.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: camel/trunk/components/camel-protobuf/pom.xml ------------------------------------------------------------------------------ svn:executable = * Propchange: camel/trunk/components/camel-protobuf/pom.xml ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: camel/trunk/components/camel-protobuf/pom.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Added: camel/trunk/components/camel-protobuf/src/main/java/org/apache/camel/dataformat/protobuf/ProtobufDataFormat.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-protobuf/src/main/java/org/apache/camel/dataformat/protobuf/ProtobufDataFormat.java?rev=892109&view=auto ============================================================================== --- camel/trunk/components/camel-protobuf/src/main/java/org/apache/camel/dataformat/protobuf/ProtobufDataFormat.java (added) +++ camel/trunk/components/camel-protobuf/src/main/java/org/apache/camel/dataformat/protobuf/ProtobufDataFormat.java Fri Dec 18 02:12:12 2009 @@ -0,0 +1,97 @@ +/** + * 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.dataformat.protobuf; + +import java.io.InputStream; +import java.io.OutputStream; +import java.lang.reflect.Method; + +import com.google.protobuf.Message; +import com.google.protobuf.Message.Builder; + +import org.apache.camel.CamelException; +import org.apache.camel.Exchange; +import org.apache.camel.InvalidPayloadException; +import org.apache.camel.spi.DataFormat; +import org.apache.camel.util.ObjectHelper; + + +public class ProtobufDataFormat implements DataFormat { + + private Message defaultInstance; + + /** + * @param defaultInstance + */ + public ProtobufDataFormat(Message defaultInstance) { + this.defaultInstance = defaultInstance; + } + + public ProtobufDataFormat() { + } + + public void setDefaultInstace(Message instance) { + this.defaultInstance = instance; + } + + public void setInstanceClass(String className) throws Exception { + ObjectHelper.notNull(className, "ProtobufDataFormat instaceClass"); + Class<?> instanceClass = ObjectHelper.loadClass(className); + if (Message.class.isAssignableFrom(instanceClass)) { + try { + Method method = instanceClass.getMethod("getDefaultInstance", new Class[0]); + defaultInstance = (Message) method.invoke(null, new Object[0]); + } catch (Exception ex) { + throw new CamelException("Can't set the defaultInstance of ProtobufferDataFormat with " + + className + ", caused by " + ex); + } + } else { + throw new CamelException("Can't set the defaultInstance of ProtobufferDataFormat with " + + className + ", as the class is not a subClass of com.google.protobuf.Message"); + } + + } + + /* + * (non-Javadoc) + * @see org.apache.camel.spi.DataFormat#marshal(org.apache.camel.Exchange, + * java.lang.Object, java.io.OutputStream) + */ + public void marshal(Exchange exchange, Object graph, OutputStream outputStream) throws Exception { + ((Message)graph).writeTo(outputStream); + } + + /* + * (non-Javadoc) + * @see org.apache.camel.spi.DataFormat#unmarshal(org.apache.camel.Exchange, + * java.io.InputStream) + */ + public Object unmarshal(Exchange exchange, InputStream inputStream) throws Exception { + if (this.defaultInstance == null) { + throw new CamelException("There is not defaultInstance for protobuf unmarshaling"); + } + Builder builder = this.defaultInstance.newBuilderForType().mergeFrom(inputStream); + if (!builder.isInitialized()) { + // TODO which exception should be thrown here? + throw new InvalidPayloadException(exchange, this.defaultInstance.getClass()); + } + + return builder.build(); + } + +} Propchange: camel/trunk/components/camel-protobuf/src/main/java/org/apache/camel/dataformat/protobuf/ProtobufDataFormat.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: camel/trunk/components/camel-protobuf/src/main/java/org/apache/camel/dataformat/protobuf/ProtobufDataFormat.java ------------------------------------------------------------------------------ svn:executable = * Propchange: camel/trunk/components/camel-protobuf/src/main/java/org/apache/camel/dataformat/protobuf/ProtobufDataFormat.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Added: camel/trunk/components/camel-protobuf/src/main/resources/META-INF/LICENSE.txt URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-protobuf/src/main/resources/META-INF/LICENSE.txt?rev=892109&view=auto ============================================================================== --- camel/trunk/components/camel-protobuf/src/main/resources/META-INF/LICENSE.txt (added) +++ camel/trunk/components/camel-protobuf/src/main/resources/META-INF/LICENSE.txt Fri Dec 18 02:12:12 2009 @@ -0,0 +1,203 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed 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. + Propchange: camel/trunk/components/camel-protobuf/src/main/resources/META-INF/LICENSE.txt ------------------------------------------------------------------------------ svn:eol-style = native Propchange: camel/trunk/components/camel-protobuf/src/main/resources/META-INF/LICENSE.txt ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: camel/trunk/components/camel-protobuf/src/main/resources/META-INF/NOTICE.txt URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-protobuf/src/main/resources/META-INF/NOTICE.txt?rev=892109&view=auto ============================================================================== --- camel/trunk/components/camel-protobuf/src/main/resources/META-INF/NOTICE.txt (added) +++ camel/trunk/components/camel-protobuf/src/main/resources/META-INF/NOTICE.txt Fri Dec 18 02:12:12 2009 @@ -0,0 +1,14 @@ + ========================================================================= + == NOTICE file corresponding to the section 4 d of == + == the Apache License, Version 2.0, == + == in this case for the Apache Camel distribution. == + ========================================================================= + + This product includes software developed by + The Apache Software Foundation (http://www.apache.org/). + + This product includes software developed by + The HAPI Project (http://hl7api.sourceforge.net/). + + Please read the different LICENSE files present in the licenses directory of + this distribution. Propchange: camel/trunk/components/camel-protobuf/src/main/resources/META-INF/NOTICE.txt ------------------------------------------------------------------------------ svn:eol-style = native Propchange: camel/trunk/components/camel-protobuf/src/main/resources/META-INF/NOTICE.txt ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: camel/trunk/components/camel-protobuf/src/main/resources/META-INF/services/org/apache/camel/dataformat/protobuf URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-protobuf/src/main/resources/META-INF/services/org/apache/camel/dataformat/protobuf?rev=892109&view=auto ============================================================================== --- camel/trunk/components/camel-protobuf/src/main/resources/META-INF/services/org/apache/camel/dataformat/protobuf (added) +++ camel/trunk/components/camel-protobuf/src/main/resources/META-INF/services/org/apache/camel/dataformat/protobuf Fri Dec 18 02:12:12 2009 @@ -0,0 +1,18 @@ +# +# 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. +# + +class=org.apache.camel.dataformat.protobuf.ProtobufDataFormat Added: camel/trunk/components/camel-protobuf/src/test/java/org/apache/camel/dataformat/protobuf/ProtobufMarshalTest.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-protobuf/src/test/java/org/apache/camel/dataformat/protobuf/ProtobufMarshalTest.java?rev=892109&view=auto ============================================================================== --- camel/trunk/components/camel-protobuf/src/test/java/org/apache/camel/dataformat/protobuf/ProtobufMarshalTest.java (added) +++ camel/trunk/components/camel-protobuf/src/test/java/org/apache/camel/dataformat/protobuf/ProtobufMarshalTest.java Fri Dec 18 02:12:12 2009 @@ -0,0 +1,81 @@ +/** + * 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.dataformat.protobuf; + +import org.apache.camel.InvalidPayloadException; +import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.component.mock.MockEndpoint; +import org.apache.camel.dataformat.protobuf.generated.AddressBookProtos; +import org.apache.camel.dataformat.protobuf.generated.AddressBookProtos.Person; +import org.apache.camel.test.junit4.CamelTestSupport; +import org.junit.Test; + +public class ProtobufMarshalTest extends CamelTestSupport { + + /** + * @throws Exception + */ + @Test + public void testMarshalAndUnmarshalWithDSL() throws Exception { + marshalAndUnmarshal("direct:in", "direct:back"); + } + + @Test + public void testMarshalAndUnmarshalWithDataFormat() throws Exception { + marshalAndUnmarshal("direct:marshal", "direct:unmarshal"); + } + + private void marshalAndUnmarshal(String inURI, String outURI) throws Exception { + org.apache.camel.dataformat.protobuf.generated.AddressBookProtos.Person input = AddressBookProtos.Person + .newBuilder().setName("Martin").setId(1234).build(); + + MockEndpoint mock = getMockEndpoint("mock:reverse"); + mock.expectedMessageCount(1); + mock.message(0).body().isInstanceOf(Person.class); + mock.message(0).body().equals(input); + + Object marshalled = template.requestBody(inURI, input); + + template.sendBody(outURI, marshalled); + + mock.assertIsSatisfied(); + + Person output = mock.getReceivedExchanges().get(0).getIn().getBody(Person.class); + assertEquals("Martin", output.getName()); + } + + @Override + protected RouteBuilder createRouteBuilder() throws Exception { + return new RouteBuilder() { + + @Override + public void configure() throws Exception { + + ProtobufDataFormat format = new ProtobufDataFormat(Person.getDefaultInstance()); + + from("direct:in").marshal(format); + from("direct:back").unmarshal(format).to("mock:reverse"); + + from("direct:marshal").marshal().protobuf(); + from("direct:unmarshal").unmarshal().protobuf("org.apache.camel.dataformat.protobuf.generated.AddressBookProtos$Person").to("mock:reverse"); + + } + }; + } + +} Propchange: camel/trunk/components/camel-protobuf/src/test/java/org/apache/camel/dataformat/protobuf/ProtobufMarshalTest.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: camel/trunk/components/camel-protobuf/src/test/java/org/apache/camel/dataformat/protobuf/ProtobufMarshalTest.java ------------------------------------------------------------------------------ svn:executable = * Propchange: camel/trunk/components/camel-protobuf/src/test/java/org/apache/camel/dataformat/protobuf/ProtobufMarshalTest.java ------------------------------------------------------------------------------ svn:keywords = Rev Date