You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by ga...@apache.org on 2014/08/09 00:42:03 UTC
git commit: JCLOUDS-622: Remove last vestiges of InputSupplier
Repository: jclouds
Updated Branches:
refs/heads/master b219208d6 -> 80a0256cc
JCLOUDS-622: Remove last vestiges of InputSupplier
Guava 16 deprecated InputSupplier and a future release will remove it.
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/80a0256c
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/80a0256c
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/80a0256c
Branch: refs/heads/master
Commit: 80a0256cc7919b32612cfa585e7f4224f412ea02
Parents: b219208
Author: Andrew Gaul <ga...@apache.org>
Authored: Sat Apr 12 13:21:33 2014 -0700
Committer: Andrew Gaul <ga...@apache.org>
Committed: Fri Aug 8 15:40:33 2014 -0700
----------------------------------------------------------------------
core/src/main/java/org/jclouds/io/Payload.java | 4 +---
core/src/main/java/org/jclouds/util/Strings2.java | 8 --------
2 files changed, 1 insertion(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/80a0256c/core/src/main/java/org/jclouds/io/Payload.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/jclouds/io/Payload.java b/core/src/main/java/org/jclouds/io/Payload.java
index c04c07e..5316d6c 100644
--- a/core/src/main/java/org/jclouds/io/Payload.java
+++ b/core/src/main/java/org/jclouds/io/Payload.java
@@ -20,9 +20,7 @@ import java.io.Closeable;
import java.io.InputStream;
import java.io.IOException;
-import com.google.common.io.InputSupplier;
-
-public interface Payload extends InputSupplier<InputStream>, Closeable {
+public interface Payload extends Closeable {
/**
* Creates a new InputStream object of the payload.
http://git-wip-us.apache.org/repos/asf/jclouds/blob/80a0256c/core/src/main/java/org/jclouds/util/Strings2.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/jclouds/util/Strings2.java b/core/src/main/java/org/jclouds/util/Strings2.java
index afaac30..2081c3d 100644
--- a/core/src/main/java/org/jclouds/util/Strings2.java
+++ b/core/src/main/java/org/jclouds/util/Strings2.java
@@ -41,7 +41,6 @@ import com.google.common.cache.CacheLoader;
import com.google.common.cache.LoadingCache;
import com.google.common.collect.Multimap;
import com.google.common.io.CharStreams;
-import com.google.common.io.InputSupplier;
import com.google.common.primitives.Chars;
public class Strings2 {
@@ -122,13 +121,6 @@ public class Strings2 {
}
}
- /** @deprecated use CharSource.read() instead */
- @Deprecated
- public static String toString(InputSupplier<? extends InputStream> supplier)
- throws IOException {
- return toStringAndClose(supplier.getInput());
- }
-
public static String toStringAndClose(InputStream input) throws IOException {
checkNotNull(input, "input");
try {