You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@jclouds.apache.org by Andrew Gaul <no...@github.com> on 2013/12/20 23:18:18 UTC

[jclouds] Replace calls to Closeables.closeQuietly (#241)

Guava 16 removes this API.  Replace with Closeables2.closeQuietly.
References JCLOUDS-413.
You can merge this Pull Request by running:

  git pull https://github.com/maginatics/jclouds close-quietly

Or you can view, comment on it, or merge it online at:

  https://github.com/jclouds/jclouds/pull/241

-- Commit Summary --

  * Replace calls to Closeables.closeQuietly

-- File Changes --

    M apis/byon/src/main/java/org/jclouds/byon/domain/YamlNode.java (4)
    M apis/cloudsigma/src/main/java/org/jclouds/cloudsigma/handlers/CloudSigmaErrorHandler.java (4)
    M apis/cloudstack/src/main/java/org/jclouds/cloudstack/handlers/CloudStackErrorHandler.java (4)
    M apis/elasticstack/src/main/java/org/jclouds/elasticstack/handlers/ElasticStackErrorHandler.java (4)
    M apis/filesystem/src/test/java/org/jclouds/filesystem/FilesystemAsyncBlobStoreTest.java (8)
    M blobstore/src/main/java/org/jclouds/blobstore/internal/BlobStoreContextImpl.java (4)
    M blobstore/src/test/java/org/jclouds/blobstore/strategy/internal/ConcatenateContainerListsTest.java (4)
    M blobstore/src/test/java/org/jclouds/blobstore/strategy/internal/DeleteAllKeysInListTest.java (4)
    M compute/src/main/java/org/jclouds/compute/domain/ExecChannel.java (9)
    M core/src/main/java/org/jclouds/crypto/Pems.java (2)
    M core/src/main/java/org/jclouds/http/HttpUtils.java (2)
    M core/src/main/java/org/jclouds/http/functions/ParseFirstJsonValueNamed.java (4)
    M core/src/main/java/org/jclouds/http/functions/ParseSax.java (6)
    M core/src/main/java/org/jclouds/http/internal/JavaUrlHttpCommandExecutorService.java (2)
    M core/src/main/java/org/jclouds/internal/ContextImpl.java (2)
    M core/src/main/java/org/jclouds/io/CopyInputStreamIntoSupplier.java (4)
    M core/src/main/java/org/jclouds/io/payloads/BasePayload.java (2)
    M core/src/main/java/org/jclouds/io/payloads/ByteSourcePayload.java (2)
    M core/src/main/java/org/jclouds/io/payloads/InputStreamPayload.java (2)
    M core/src/main/java/org/jclouds/io/payloads/InputStreamSupplierPayload.java (2)
    M core/src/main/java/org/jclouds/logging/internal/Wire.java (2)
    A core/src/main/java/org/jclouds/util/Closeables2.java (47)
    M core/src/main/java/org/jclouds/util/Strings2.java (2)
    M core/src/test/java/org/jclouds/apis/BaseApiLiveTest.java (2)
    M core/src/test/java/org/jclouds/apis/BaseContextLiveTest.java (6)
    M core/src/test/java/org/jclouds/apis/BaseViewLiveTest.java (4)
    M core/src/test/java/org/jclouds/http/BaseHttpCommandExecutorServiceIntegrationTest.java (2)
    M core/src/test/java/org/jclouds/http/BaseJettyTest.java (2)
    M drivers/gae/src/main/java/org/jclouds/gae/ConvertToGaeRequest.java (4)
    M drivers/jsch/src/main/java/org/jclouds/ssh/jsch/JschSshClient.java (8)
    M drivers/jsch/src/test/java/org/jclouds/ssh/jsch/JschSshClientLiveTest.java (4)
    M drivers/sshj/src/main/java/org/jclouds/sshj/SshjSshClient.java (8)
    M drivers/sshj/src/test/java/org/jclouds/sshj/SshjSshClientLiveTest.java (4)
    M loadbalancer/src/main/java/org/jclouds/loadbalancer/internal/LoadBalancerServiceContextImpl.java (4)
    M providers/glesys/src/main/java/org/jclouds/glesys/handlers/GleSYSErrorHandler.java (4)
    M providers/glesys/src/test/java/org/jclouds/glesys/compute/GleSYSExperimentLiveTest.java (5)
    M providers/softlayer/src/main/java/org/jclouds/softlayer/handlers/SoftLayerErrorHandler.java (4)

-- Patch Links --

https://github.com/jclouds/jclouds/pull/241.patch
https://github.com/jclouds/jclouds/pull/241.diff

Re: [jclouds] Replace calls to Closeables.closeQuietly (#241)

Posted by Andrew Phillips <no...@github.com>.
>  I minimized this commit so that we can backport to 1.7.x

Definitely +1 on this approach - was more curious about where we go from here in 1.8.x...

---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/241#issuecomment-31051994

Re: [jclouds] Replace calls to Closeables.closeQuietly (#241)

Posted by Andrew Gaul <no...@github.com>.
We can replace some of these with Closer and Closeables.close.  Others we painted ourselves into a corner by not propagating the IOException.  I minimized this commit so that we can backport to 1.7.x to allow users to include Guava 16 even if jclouds has not yet upgraded.

---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/241#issuecomment-31051637

Re: [jclouds] Replace calls to Closeables.closeQuietly (#241)

Posted by Andrew Phillips <no...@github.com>.
> jclouds-java-7-pull-requests #952 UNSTABLE

Unrelated [test failure](https://jclouds.ci.cloudbees.com/job/jclouds-java-7-pull-requests/org.apache.jclouds$jclouds-compute/952/testReport/junit/org.jclouds.compute.util/ConcurrentOpenSocketFinderTest/testChecksSocketsConcurrently/).

Looks like a straight search'n'replace so +1 - looks good to me.

Do we already have any thoughts on how (or when) we want to get rid of `Closeables2`?

---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/241#issuecomment-31050962

Re: [jclouds] Replace calls to Closeables.closeQuietly (#241)

Posted by Andrew Phillips <no...@github.com>.
> +import com.google.common.io.Closeables;
> +
> +import org.jclouds.javax.annotation.Nullable;
> +
> +@Deprecated
> +public class Closeables2 {
> +   private Closeables2() {
> +   }
> +
> +   /**
> +    * Equivalent to calling {@code Closeables.close(closeable, true)}, but with no IOException in the signature.
> +    *
> +    * @param closeable the {@code Closeable} object to be closed, or null, in which case this method
> +    *     does nothing
> +    */
> +   @Deprecated

Do we have any thoughts on how we eventually want to get rid of this?

---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/241/files#r8514916

Re: [jclouds] Replace calls to Closeables.closeQuietly (#241)

Posted by CloudBees pull request builder plugin <no...@github.com>.
[jclouds-pull-requests #489](https://jclouds.ci.cloudbees.com/job/jclouds-pull-requests/489/) SUCCESS
This pull request looks good

---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/241#issuecomment-31048765

Re: [jclouds] Replace calls to Closeables.closeQuietly (#241)

Posted by CloudBees pull request builder plugin <no...@github.com>.
[jclouds-java-7-pull-requests #952](https://jclouds.ci.cloudbees.com/job/jclouds-java-7-pull-requests/952/) UNSTABLE
Looks like there's a problem with this pull request

---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/241#issuecomment-31048734