You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2018/02/28 07:22:21 UTC
[camel] branch master updated: CAMEL-12299 - Upgrade to jcloud 2.1.x
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 5985a7c CAMEL-12299 - Upgrade to jcloud 2.1.x
5985a7c is described below
commit 5985a7ccf2da5b33e41fe110268300346aa2d975
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Feb 28 08:19:53 2018 +0100
CAMEL-12299 - Upgrade to jcloud 2.1.x
---
.../camel/component/jclouds/JcloudsPayloadConverter.java | 15 ++-------------
parent/pom.xml | 6 +++---
2 files changed, 5 insertions(+), 16 deletions(-)
diff --git a/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsPayloadConverter.java b/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsPayloadConverter.java
index c2ee88b..5fc34a5 100644
--- a/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsPayloadConverter.java
+++ b/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsPayloadConverter.java
@@ -27,7 +27,6 @@ import javax.xml.transform.stream.StreamSource;
import com.google.common.io.ByteSource;
import com.google.common.io.ByteStreams;
import com.google.common.io.Files;
-import com.google.common.io.InputSupplier;
import org.apache.camel.Converter;
import org.apache.camel.Exchange;
@@ -107,12 +106,7 @@ public final class JcloudsPayloadConverter {
InputStreamPayload payload = new InputStreamPayload(is);
// only set the contentlength if possible
if (is.markSupported()) {
- long contentLength = ByteStreams.length(new InputSupplier<InputStream>() {
- @Override
- public InputStream getInput() throws IOException {
- return is;
- }
- });
+ long contentLength = ByteStreams.toByteArray(is).length;
is.reset();
payload.getContentMetadata().setContentLength(contentLength);
}
@@ -126,12 +120,7 @@ public final class JcloudsPayloadConverter {
@Converter
public static Payload toPayload(final StreamSourceCache cache, Exchange exchange) throws IOException {
- long contentLength = ByteStreams.length(new InputSupplier<InputStream>() {
- @Override
- public InputStream getInput() throws IOException {
- return cache.getInputStream();
- }
- });
+ long contentLength = ByteStreams.toByteArray(cache.getInputStream()).length;
cache.reset();
InputStreamPayload payload = new InputStreamPayload(cache.getInputStream());
payload.getContentMetadata().setContentLength(contentLength);
diff --git a/parent/pom.xml b/parent/pom.xml
index 93ea386..2b7d936 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -369,10 +369,10 @@
<jboss-transaction-spi.version>7.5.1.Final</jboss-transaction-spi.version>
<jboss-xnio-version>3.3.8.Final</jboss-xnio-version>
<jcache-bundle-version>1.0.0_1</jcache-bundle-version>
- <jclouds-version>2.0.3</jclouds-version>
+ <jclouds-version>2.1.0</jclouds-version>
<!-- jclouds must use this guava version -->
- <jclouds-google-guava-version>16.0.1</jclouds-google-guava-version>
- <jclouds-google-guava-version-range>[16.0,17.0)</jclouds-google-guava-version-range>
+ <jclouds-google-guava-version>18.0</jclouds-google-guava-version>
+ <jclouds-google-guava-version-range>[18.0,19.0)</jclouds-google-guava-version-range>
<jcommander-version>1.72</jcommander-version>
<jcr-version>2.0</jcr-version>
<jdom-bundle-version>1.1_4</jdom-bundle-version>
--
To stop receiving notification emails like this one, please contact
acosentino@apache.org.