Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

JCLOUDS-622: Remove last vestiges of InputSupplier 

Guava 16 deprecated InputSupplier and a future release will remove it.
This commit is contained in:
Andrew Gaul 2014-04-12 13:21:33 -07:00
parent b219208d6c
commit 80a0256cc7
2 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/main/java/org/jclouds/io/Payload.java
View File

@ -20,9 +20,7 @@ import java.io.Closeable;
import java.io.InputStream; import java.io.InputStream;
import java.io.IOException; import java.io.IOException;
import com.google.common.io.InputSupplier; public interface Payload extends Closeable {
public interface Payload extends InputSupplier<InputStream>, Closeable {
/** /**
* Creates a new InputStream object of the payload. * Creates a new InputStream object of the payload.

8
core/src/main/java/org/jclouds/util/Strings2.java
View File

@ -41,7 +41,6 @@ import com.google.common.cache.CacheLoader;
import com.google.common.cache.LoadingCache; import com.google.common.cache.LoadingCache;
import com.google.common.collect.Multimap; import com.google.common.collect.Multimap;
import com.google.common.io.CharStreams; import com.google.common.io.CharStreams;
import com.google.common.io.InputSupplier;
import com.google.common.primitives.Chars; import com.google.common.primitives.Chars;
public class Strings2 { 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 { public static String toStringAndClose(InputStream input) throws IOException {
checkNotNull(input, "input"); checkNotNull(input, "input");
try { try {