Repository: camel Updated Branches: refs/heads/master 72ec197e3 -> 984de3dd7
CAMEL-8281: camel-box - Improved type conversion. Thanks to Julian Cable for the patch. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/01c6c0ac Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/01c6c0ac Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/01c6c0ac Branch: refs/heads/master Commit: 01c6c0ac36bfed87a4b3937ccfb92fb93b85f019 Parents: 72ec197 Author: Claus Ibsen <davscl...@apache.org> Authored: Fri Feb 6 12:25:11 2015 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Fri Feb 6 12:25:11 2015 +0100 ---------------------------------------------------------------------- .../apache/camel/component/box/BoxConverter.java | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/01c6c0ac/components/camel-box/src/main/java/org/apache/camel/component/box/BoxConverter.java ---------------------------------------------------------------------- diff --git a/components/camel-box/src/main/java/org/apache/camel/component/box/BoxConverter.java b/components/camel-box/src/main/java/org/apache/camel/component/box/BoxConverter.java index 142b725..c5a5b14 100644 --- a/components/camel-box/src/main/java/org/apache/camel/component/box/BoxConverter.java +++ b/components/camel-box/src/main/java/org/apache/camel/component/box/BoxConverter.java @@ -18,6 +18,7 @@ package org.apache.camel.component.box; import java.io.File; import java.io.InputStream; +import java.io.ByteArrayInputStream; import com.box.restclientv2.requestsbase.BoxFileUploadRequestObject; import org.apache.camel.Converter; @@ -35,8 +36,8 @@ public final class BoxConverter { @Converter public static BoxFileUploadRequestObject genericFileToBoxFileUploadRequestObject(GenericFile<?> file, Exchange exchange) throws Exception { String folderId = "0"; - if (exchange != null) { - folderId = exchange.getProperty(BoxConstants.PROPERTY_PREFIX + "folderId", "0", String.class); + if (exchange != null && exchange.getIn() != null) { + folderId = exchange.getIn().getHeader(BoxConstants.PROPERTY_PREFIX + "folderId", "0", String.class); } if (file.getFile() instanceof File) { // prefer to use a file input stream if its a java.io.File @@ -51,4 +52,16 @@ public final class BoxConverter { } return null; } + + @Converter + public static BoxFileUploadRequestObject toBox(byte[] data, Exchange exchange) throws Exception { + String folderId = "0"; + String fileName = "dummy.bin"; + if (exchange != null && exchange.getIn() != null) { + folderId = exchange.getIn().getHeader(BoxConstants.PROPERTY_PREFIX + "folderId", "0", String.class); + fileName = exchange.getIn().getHeader("CamelFileName", String.class); + } + InputStream is = new ByteArrayInputStream(data); + return BoxFileUploadRequestObject.uploadFileRequestObject(folderId, fileName, is); + } }
