svn commit: r1541011 - in /jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark: ReadManyTest.java SmallFileReadTest.java

[chetanm]

Author: chetanm
Date: Tue Nov 12 11:45:11 2013
New Revision: 1541011

URL: http://svn.apache.org/r1541011
Log:
OAK-1169 - Update Guava to version 15.0

Preparing for the update to 15.0

Replacing the usage of deprecated com.google.common.io.NullOutputStream with
ByteStreams.nullOutputStream() as this class has been removed in 15.0

Modified:
    
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/ReadManyTest.java
    
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/SmallFileReadTest.java

Modified: 
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/ReadManyTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/ReadManyTest.java?rev=1541011&r1=1541010&r2=1541011&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/ReadManyTest.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/ReadManyTest.java
 Tue Nov 12 11:45:11 2013
@@ -29,7 +29,6 @@ import javax.jcr.Session;
 import org.apache.jackrabbit.commons.JcrUtils;
 
 import com.google.common.io.ByteStreams;
-import com.google.common.io.NullOutputStream;
 
 abstract class ReadManyTest extends AbstractTest {
 
@@ -64,7 +63,7 @@ abstract class ReadManyTest extends Abst
             try {
                 InputStream stream = binary.getStream();
                 try {
-                    ByteStreams.copy(stream, new NullOutputStream());
+                    ByteStreams.copy(stream, ByteStreams.nullOutputStream());
                 } finally {
                     stream.close();
                 }

Modified: 
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/SmallFileReadTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/SmallFileReadTest.java?rev=1541011&r1=1541010&r2=1541011&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/SmallFileReadTest.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/SmallFileReadTest.java
 Tue Nov 12 11:45:11 2013
@@ -24,7 +24,6 @@ import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 
 import com.google.common.io.ByteStreams;
-import com.google.common.io.NullOutputStream;
 
 public class SmallFileReadTest extends AbstractTest {
 
@@ -60,7 +59,7 @@ public class SmallFileReadTest extends A
             Node content = file.getNode("jcr:content");
             InputStream stream = content.getProperty("jcr:data").getStream();
             try {
-                ByteStreams.copy(stream, new NullOutputStream());
+                ByteStreams.copy(stream, ByteStreams.nullOutputStream());
             } finally {
                 stream.close();
             }