Automatic code cleanup.

PiperOrigin-RevId: 383207440

src/test/java/com/google/devtools/build/android/ziputils/FakeFileSystem.java

diff --git a/src/test/java/com/google/devtools/build/android/ziputils/FakeFileSystem.java b/src/test/java/com/google/devtools/build/android/ziputils/FakeFileSystem.java
index 0d87710..d7a6473 100644
--- a/src/test/java/com/google/devtools/build/android/ziputils/FakeFileSystem.java
+++ b/src/test/java/com/google/devtools/build/android/ziputils/FakeFileSystem.java
@@ -115,6 +115,19 @@
     }
 
     @Override
+    public int read(ByteBuffer dst, long position) throws IOException {
+      if (position < 0 || position >= data.length) {
+        throw new IOException("out of bounds");
+      }
+      int remaining = data.length - (int) position;
+      if (dst.remaining() < remaining) {
+        remaining = dst.remaining();
+      }
+      dst.put(data, (int) position, remaining);
+      return remaining;
+    }
+
+    @Override
     public int write(ByteBuffer src) throws IOException {
       throw new UnsupportedOperationException("Not supported yet.");
     }
@@ -125,6 +138,11 @@
     }
 
     @Override
+    public int write(ByteBuffer src, long position) throws IOException {
+      throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
     public long position() throws IOException {
       return position;
     }
@@ -163,24 +181,6 @@
     }
 
     @Override
-    public int read(ByteBuffer dst, long position) throws IOException {
-      if (position < 0 || position >= data.length) {
-        throw new IOException("out of bounds");
-      }
-      int remaining = data.length - (int) position;
-      if (dst.remaining() < remaining) {
-        remaining = dst.remaining();
-      }
-      dst.put(data, (int) position, remaining);
-      return remaining;
-    }
-
-    @Override
-    public int write(ByteBuffer src, long position) throws IOException {
-      throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
     public MappedByteBuffer map(FileChannel.MapMode mode, long position, long size)
         throws IOException {
       throw new UnsupportedOperationException("Not supported yet.");
@@ -228,6 +228,11 @@
     }
 
     @Override
+    public int read(ByteBuffer dst, long position) throws IOException {
+      throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
     public int write(ByteBuffer src) throws IOException {
       byte[] bytes = new byte[src.remaining()];
       src.get(bytes);
@@ -242,6 +247,11 @@
     }
 
     @Override
+    public int write(ByteBuffer src, long position) throws IOException {
+      throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    @Override
     public long position() throws IOException {
       return position;
     }
@@ -279,16 +289,6 @@
     }
 
     @Override
-    public int read(ByteBuffer dst, long position) throws IOException {
-      throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public int write(ByteBuffer src, long position) throws IOException {
-      throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
     public MappedByteBuffer map(FileChannel.MapMode mode, long position, long size)
         throws IOException {
       throw new UnsupportedOperationException("Not supported yet.");

src/test/java/com/google/devtools/build/android/ziputils/ScanUtilTest.java

diff --git a/src/test/java/com/google/devtools/build/android/ziputils/ScanUtilTest.java b/src/test/java/com/google/devtools/build/android/ziputils/ScanUtilTest.java
index 20906c5..0b7411b 100644
--- a/src/test/java/com/google/devtools/build/android/ziputils/ScanUtilTest.java
+++ b/src/test/java/com/google/devtools/build/android/ziputils/ScanUtilTest.java
@@ -80,7 +80,8 @@
   private void assertLocation(byte[] target, byte[] domain, int expected) {
     int pos = ScanUtil.scanTo(target, domain != null ? ByteBuffer.wrap(domain) : null);
     assertWithMessage("Position of " + Arrays.toString(target) + " in " + Arrays.toString(domain))
-        .that(expected).isEqualTo(pos);
+        .that(pos)
+        .isEqualTo(expected);
   }
 
   private void assertBackwardsLocation(byte[] target, byte[] domain, int expected) {
@@ -90,8 +91,16 @@
       buf.position(buf.limit());
     }
     int pos = ScanUtil.scanBackwardsTo(target, buf);
-    assertWithMessage("Position of " + Arrays.toString(target) + " in " + Arrays.toString(domain)
-        + ", " + buf.position() + ", " + buf.limit())
-        .that(expected).isEqualTo(pos);
+    assertWithMessage(
+            "Position of "
+                + Arrays.toString(target)
+                + " in "
+                + Arrays.toString(domain)
+                + ", "
+                + buf.position()
+                + ", "
+                + buf.limit())
+        .that(pos)
+        .isEqualTo(expected);
   }
 }

src/test/java/com/google/devtools/build/android/ziputils/ViewTest.java

diff --git a/src/test/java/com/google/devtools/build/android/ziputils/ViewTest.java b/src/test/java/com/google/devtools/build/android/ziputils/ViewTest.java
index 186c485..b1d10b8 100644
--- a/src/test/java/com/google/devtools/build/android/ziputils/ViewTest.java
+++ b/src/test/java/com/google/devtools/build/android/ziputils/ViewTest.java
@@ -143,22 +143,22 @@
       super(buffer);
     }
 
-    // Will advance buffer position
+    // Will advance buffer position.
     public void putInt(int value) {
       buffer.putInt(value);
     }
 
-    // Will advance buffer position
-    public int getInt() {
-      return buffer.getInt();
-    }
-
-    // will not advance buffer position
+    // Will not advance buffer position.
     public void putInt(int index, int value) {
       buffer.putInt(index, value);
     }
 
-    // will not advance buffer position
+    // Will advance buffer position.
+    public int getInt() {
+      return buffer.getInt();
+    }
+
+    // Will not advance buffer position.
     public int getInt(int index) {
       return buffer.getInt(index);
     }