Storage Copybara: Fixing ErrorProne Warnings (#509)

Author: schmidt-sebastian

firebase-storage/src/test/java/com/google/firebase/storage/TestUtil.java

@@ -80,21 +80,19 @@ private static void verifyTaskStateChanges(@Nullable InputStream inputStream, St
     }
 
     StringBuilder baselineContents = new StringBuilder();
-    try {
-      BufferedReader br = new BufferedReader(new InputStreamReader(inputStream, "UTF-8"));
+    try (BufferedReader br = new BufferedReader(new InputStreamReader(inputStream, "UTF-8"))) {
       // skip to first <new>
       String line;
       while ((line = br.readLine()) != null) {
         baselineContents.append(line).append("\n");
       }
-      inputStream.close();
     } catch (IOException e) {
-      e.printStackTrace();
+      throw new RuntimeException(e);
     }
 
-    try {
-      BufferedReader current = new BufferedReader(new StringReader(contents));
-      BufferedReader baseline = new BufferedReader(new StringReader(baselineContents.toString()));
+    try (BufferedReader current = new BufferedReader(new StringReader(contents));
+        BufferedReader baseline =
+            new BufferedReader(new StringReader(baselineContents.toString()))) {
       String originalLine;
       String newLine;
       // skip to first <new>
@@ -121,16 +119,8 @@ private static void verifyTaskStateChanges(@Nullable InputStream inputStream, St
         }
         line++;
       }
-      current.close();
-      baseline.close();
     } catch (IOException e) {
-      e.printStackTrace();
-    }
-
-    try {
-      inputStream.close();
-    } catch (IOException e) {
-      e.printStackTrace();
+      throw new RuntimeException(e);
     }
   }
 

firebase-storage/src/test/java/com/google/firebase/storage/network/MockConnectionFactory.java

@@ -41,12 +41,8 @@
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mockito;
 import org.mockito.exceptions.base.MockitoAssertionError;
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
 
 public class MockConnectionFactory implements HttpURLConnectionFactory {
-  private static final String LOG_TAG = MockConnectionFactory.class.getName();
-
   private final boolean binaryBody;
   HttpURLConnection oldMock;
   List<String> verifications = new ArrayList<>();
@@ -69,7 +65,7 @@ public MockConnectionFactory(String testName, boolean binaryBody) {
         }
       }
     } catch (IOException e) {
-      e.printStackTrace();
+      throw new RuntimeException(e);
     }
   }
 
@@ -166,16 +162,13 @@ public synchronized HttpURLConnection createInstance(@NonNull URL url) throws IO
     currentRecord++;
     if (currentRecord == pauseRecord) {
       Mockito.doAnswer(
-              new Answer<Void>() {
-                @Override
-                public Void answer(InvocationOnMock invocation) {
-                  try {
-                    pauseSemaphore.acquire();
-                  } catch (InterruptedException e) {
-                    e.printStackTrace();
-                  }
-                  return null;
+              invocation -> {
+                try {
+                  pauseSemaphore.acquire();
+                } catch (InterruptedException e) {
+                  Thread.currentThread().interrupt();
                 }
+                return null;
               })
           .when(mock)
           .disconnect();
@@ -205,7 +198,7 @@ public synchronized void verifyOldMock() {
           try {
             verify(oldMock).setRequestMethod(value);
           } catch (ProtocolException e) {
-            e.printStackTrace();
+            throw new RuntimeException(e);
           }
         } else if (key.equalsIgnoreCase("setRequestProperty")) {
           int comma = value.indexOf(',');