This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository guava-libraries.
commit 5a31cb5e060c2ce46c54aa62ec6e5ad3db0d8e55 Author: Emmanuel Bourg <[email protected]> Date: Thu Jun 4 20:00:55 2015 +0200 Restored the ByteStreams.join(InputSupplier...) method --- debian/changelog | 1 + debian/patches/06-preserve-pre-guava18-methods.patch | 15 ++++++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 2981cfe..ff398fc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ guava-libraries (18.0-2) UNRELEASED; urgency=medium * Improved the backward compatibility: - Reimplemented the InputSupplier and OutputSupplier interfaces in the ByteSource, ByteSink, CharSource and CharSink classes + - Restored the ByteStreams.join(InputSupplier...) method -- Emmanuel Bourg <[email protected]> Thu, 04 Jun 2015 17:39:06 +0200 diff --git a/debian/patches/06-preserve-pre-guava18-methods.patch b/debian/patches/06-preserve-pre-guava18-methods.patch index 319eccd..12079ec 100644 --- a/debian/patches/06-preserve-pre-guava18-methods.patch +++ b/debian/patches/06-preserve-pre-guava18-methods.patch @@ -171,7 +171,7 @@ Forwarded: not-needed * Copies all bytes from the input stream to the output stream. * Does not close or flush either stream. * -@@ -738,4 +772,128 @@ +@@ -738,4 +772,141 @@ } return total; } @@ -229,6 +229,19 @@ Forwarded: not-needed + } + + /** ++ * Varargs form of {@link #join(Iterable)}. ++ * ++ * @deprecated Use {@link ByteSource#concat(ByteSource[])} instead. This ++ * method is scheduled for removal in Guava 18.0. ++ */ ++ @Deprecated ++ @SuppressWarnings("unchecked") // suppress "possible heap pollution" warning in JDK7 ++ public static InputSupplier<InputStream> join( ++ InputSupplier<? extends InputStream>... suppliers) { ++ return join(Arrays.asList(suppliers)); ++ } ++ ++ /** + * Returns a view of the given {@code InputStream} supplier as a + * {@code ByteSource}. + * -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/guava-libraries.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
