diff --git a/firebase-storage/src/main/java/com/google/firebase/storage/StorageTaskManager.java b/firebase-storage/src/main/java/com/google/firebase/storage/StorageTaskManager.java index 8814afcfbe8..8a89deb37c5 100644 --- a/firebase-storage/src/main/java/com/google/firebase/storage/StorageTaskManager.java +++ b/firebase-storage/src/main/java/com/google/firebase/storage/StorageTaskManager.java @@ -46,7 +46,7 @@ public List getUploadTasksUnder(@NonNull StorageReference parent) { String parentPath = parent.toString(); for (Map.Entry>> entry : inProgressTasks.entrySet()) { if (entry.getKey().startsWith(parentPath)) { - StorageTask task = entry.getValue().get(); + StorageTask task = entry.getValue().get(); if (task instanceof UploadTask) { inProgressList.add((UploadTask) task); } diff --git a/firebase-storage/src/test/java/com/google/firebase/storage/internal/MockSleeperHelper.java b/firebase-storage/src/test/java/com/google/firebase/storage/internal/MockSleeperHelper.java index d4dcd14ca15..021e442a243 100644 --- a/firebase-storage/src/test/java/com/google/firebase/storage/internal/MockSleeperHelper.java +++ b/firebase-storage/src/test/java/com/google/firebase/storage/internal/MockSleeperHelper.java @@ -16,7 +16,7 @@ /** Helper for mocking sleep for exponential backoff. */ public class MockSleeperHelper implements Sleeper { - private MockClockHelper clock; + private final MockClockHelper clock; public MockSleeperHelper(MockClockHelper clock) { this.clock = clock; diff --git a/firebase-storage/src/testUtil/java/com/google/firebase/storage/TestCommandHelper.java b/firebase-storage/src/testUtil/java/com/google/firebase/storage/TestCommandHelper.java index 3589cc83c93..8a4cca4b5ba 100644 --- a/firebase-storage/src/testUtil/java/com/google/firebase/storage/TestCommandHelper.java +++ b/firebase-storage/src/testUtil/java/com/google/firebase/storage/TestCommandHelper.java @@ -48,7 +48,7 @@ public static Task testDownloadUrl(StorageReference ref) { executor, task -> { builder.append("Received Download Url.\n"); - builder.append("getDownloadUrl:").append(task.getResult().toString()); + builder.append("getDownloadUrl:").append(task.getResult()); builder.append("\nonComplete:Success=\n").append(task.isSuccessful()); result.setResult(builder); }); @@ -180,7 +180,7 @@ public static void dumpMetadata(final StringBuilder builder, @Nullable StorageMe builder.append("getMD5Hash:").append(metadata.getMd5Hash()).append("\n"); builder.append("getGeneration:").append(metadata.getGeneration()).append("\n"); builder.append("getMetadataGeneration:").append(metadata.getMetadataGeneration()).append("\n"); - builder.append("getSizeBytes:").append(Long.toString(metadata.getSizeBytes())).append("\n"); + builder.append("getSizeBytes:").append(metadata.getSizeBytes()).append("\n"); builder.append("getReference:").append(metadata.getReference().getName()).append("\n"); SimpleDateFormat sdf = new SimpleDateFormat("MM/dd/yyyy", Locale.getDefault()); sdf.setTimeZone(TimeZone.getTimeZone("America/Los_Angeles")); diff --git a/firebase-storage/src/testUtil/java/com/google/firebase/storage/TestDownloadHelper.java b/firebase-storage/src/testUtil/java/com/google/firebase/storage/TestDownloadHelper.java index b38dd60b3fc..a301ccb7651 100644 --- a/firebase-storage/src/testUtil/java/com/google/firebase/storage/TestDownloadHelper.java +++ b/firebase-storage/src/testUtil/java/com/google/firebase/storage/TestDownloadHelper.java @@ -30,8 +30,8 @@ @SuppressWarnings("unused") public class TestDownloadHelper { private static final String TAG = "TestDownloadHelper"; - private static Bitmap mIcon; - private static byte[] mBytes; + private static Bitmap icon; + private static byte[] bytes; public static class StreamDownloadResponse { public StringBuilder mainTask = new StringBuilder(); @@ -59,8 +59,8 @@ public static Task streamDownload( response.backgroundTask.append(statusMessage); try { - mBytes = IOUtils.toByteArray(stream); - mIcon = BitmapFactory.decodeByteArray(mBytes, 0, mBytes.length); + bytes = IOUtils.toByteArray(stream); + icon = BitmapFactory.decodeByteArray(bytes, 0, bytes.length); } catch (OutOfMemoryError e) { Log.w(TAG, "Can't persist download due to low memory", e); } @@ -71,7 +71,7 @@ public static Task streamDownload( if (state.getTotalByteCount() != -1) { Preconditions.checkState(totalByteCountBeginning == state.getTotalByteCount()); - Preconditions.checkState(mBytes.length == state.getTotalByteCount()); + Preconditions.checkState(bytes.length == state.getTotalByteCount()); } } finally { // Closing stream @@ -106,10 +106,10 @@ public static Task streamDownload( Log.i(TAG, statusMessage); response.mainTask.append(statusMessage); if (imageCallback != null) { - imageCallback.run(mIcon); + imageCallback.run(icon); } if (byteCallback != null) { - byteCallback.run(mBytes); + byteCallback.run(bytes); } }) .addOnFailureListener( @@ -219,7 +219,7 @@ public static Task fileDownload( .addOnFailureListener( e -> { ControllableSchedulerHelper.getInstance().verifyCallbackThread(); - String statusMessage = "\nonFailure:\n" + e.toString(); + String statusMessage = "\nonFailure:\n" + e; Log.i(TAG, statusMessage); builder.append(statusMessage); }) diff --git a/firebase-storage/src/testUtil/java/com/google/firebase/storage/TestUploadHelper.java b/firebase-storage/src/testUtil/java/com/google/firebase/storage/TestUploadHelper.java index 604b30b8419..1544970c677 100644 --- a/firebase-storage/src/testUtil/java/com/google/firebase/storage/TestUploadHelper.java +++ b/firebase-storage/src/testUtil/java/com/google/firebase/storage/TestUploadHelper.java @@ -300,7 +300,7 @@ public static Task streamUploadWithInterruptions() { * indicates end of stream. */ class WonkyStream extends InputStream { - private ArrayList streamData = new ArrayList<>(); + private final ArrayList streamData = new ArrayList<>(); private WonkyStream() { streamData.add(new byte[] {0, 1, 2}); @@ -319,17 +319,6 @@ public int read() { } } - private void removeData(int removeFirst) { - if (streamData.get(0).length == removeFirst) { - streamData.remove(0); - } else { - streamData.set( - 0, - Arrays.copyOfRange( - streamData.get(0), removeFirst, streamData.get(0).length - removeFirst)); - } - } - @Override public int read(byte[] b, int off, int len) { if (streamData.isEmpty()) { @@ -342,6 +331,17 @@ public int read(byte[] b, int off, int len) { } } + private void removeData(int removeFirst) { + if (streamData.get(0).length == removeFirst) { + streamData.remove(0); + } else { + streamData.set( + 0, + Arrays.copyOfRange( + streamData.get(0), removeFirst, streamData.get(0).length - removeFirst)); + } + } + @Override public int available() { if (streamData.isEmpty()) { diff --git a/firebase-storage/src/testUtil/java/com/google/firebase/storage/network/MockInputStreamHelper.java b/firebase-storage/src/testUtil/java/com/google/firebase/storage/network/MockInputStreamHelper.java index af31ca3fcd6..e03c90575f8 100644 --- a/firebase-storage/src/testUtil/java/com/google/firebase/storage/network/MockInputStreamHelper.java +++ b/firebase-storage/src/testUtil/java/com/google/firebase/storage/network/MockInputStreamHelper.java @@ -71,7 +71,7 @@ public int read(byte[] b, int off, int len) throws IOException { } int bytesRead = inputStream.read(b, off, len); - currentOffset += bytesRead > 0 ? bytesRead : 0; + currentOffset += Math.max(bytesRead, 0); return bytesRead; }