Use DataInput and DataOutput instead of their stream versions.

This communicates the intent better: MapCodec implementations aren't supposed to interact with the stream other than reading from/writing to it.

PiperOrigin-RevId: 742661148
Change-Id: I11fa47f37aab3d82e45c494a532f8a2008659d80

Author: tjgq

src/main/java/com/google/devtools/build/lib/actions/cache/CompactPersistentActionCache.java

@@ -41,8 +41,8 @@
 import com.google.devtools.build.lib.vfs.Path;
 import com.google.devtools.build.lib.vfs.PathFragment;
 import java.io.ByteArrayOutputStream;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
+import java.io.DataInput;
+import java.io.DataOutput;
 import java.io.IOException;
 import java.io.PrintStream;
 import java.nio.BufferUnderflowException;
@@ -82,12 +82,12 @@ public class CompactPersistentActionCache implements ActionCache {
   private static final MapCodec<Integer, byte[]> CODEC =
       new MapCodec<Integer, byte[]>() {
         @Override
-        protected Integer readKey(DataInputStream in) throws IOException {
+        protected Integer readKey(DataInput in) throws IOException {
           return in.readInt();
         }
 
         @Override
-        protected byte[] readValue(DataInputStream in) throws IOException {
+        protected byte[] readValue(DataInput in) throws IOException {
           int size = in.readInt();
           if (size < 0) {
             throw new IOException("found negative array size: " + size);
@@ -98,12 +98,12 @@ protected byte[] readValue(DataInputStream in) throws IOException {
         }
 
         @Override
-        protected void writeKey(Integer key, DataOutputStream out) throws IOException {
+        protected void writeKey(Integer key, DataOutput out) throws IOException {
           out.writeInt(key);
         }
 
         @Override
-        protected void writeValue(byte[] value, DataOutputStream out) throws IOException {
+        protected void writeValue(byte[] value, DataOutput out) throws IOException {
           out.writeInt(value.length);
           out.write(value);
         }

src/main/java/com/google/devtools/build/lib/actions/cache/PersistentStringIndexer.java

@@ -22,8 +22,8 @@
 import com.google.devtools.build.lib.util.PersistentMap;
 import com.google.devtools.build.lib.util.StringIndexer;
 import com.google.devtools.build.lib.vfs.Path;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
+import java.io.DataInput;
+import java.io.DataOutput;
 import java.io.IOException;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
@@ -187,7 +187,7 @@ public String toString() {
   private static final MapCodec<String, Integer> CODEC =
       new MapCodec<String, Integer>() {
         @Override
-        protected String readKey(DataInputStream in) throws IOException {
+        protected String readKey(DataInput in) throws IOException {
           int length = in.readInt();
           if (length < 0) {
             throw new IOException("corrupt key length: " + length);
@@ -198,19 +198,19 @@ protected String readKey(DataInputStream in) throws IOException {
         }
 
         @Override
-        protected Integer readValue(DataInputStream in) throws IOException {
+        protected Integer readValue(DataInput in) throws IOException {
           return in.readInt();
         }
 
         @Override
-        protected void writeKey(String key, DataOutputStream out) throws IOException {
+        protected void writeKey(String key, DataOutput out) throws IOException {
           byte[] content = key.getBytes(UTF_8);
           out.writeInt(content.length);
           out.write(content);
         }
 
         @Override
-        protected void writeValue(Integer value, DataOutputStream out) throws IOException {
+        protected void writeValue(Integer value, DataOutput out) throws IOException {
           out.writeInt(value);
         }
       };

src/main/java/com/google/devtools/build/lib/util/MapCodec.java

@@ -16,7 +16,9 @@
 import com.google.devtools.build.lib.vfs.Path;
 import java.io.BufferedOutputStream;
 import java.io.ByteArrayInputStream;
+import java.io.DataInput;
 import java.io.DataInputStream;
+import java.io.DataOutput;
 import java.io.DataOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -36,17 +38,17 @@ public IncompatibleFormatException(String message) {
   private static final int MAX_ARRAY_SIZE = Integer.MAX_VALUE - 8;
   private static final int ENTRY_MAGIC = 0xfe;
 
-  /** Reads a key from a {@link DataInputStream}. */
-  protected abstract K readKey(DataInputStream in) throws IOException;
+  /** Reads a key from a {@link DataInput}. */
+  protected abstract K readKey(DataInput in) throws IOException;
 
-  /** Reads a value from a {@link DataInputStream}. */
-  protected abstract V readValue(DataInputStream in) throws IOException;
+  /** Reads a value from a {@link DataInput}. */
+  protected abstract V readValue(DataInput in) throws IOException;
 
-  /** Writes a key into a {@link DataOutputStream}. */
-  protected abstract void writeKey(K key, DataOutputStream out) throws IOException;
+  /** Writes a key into a {@link DataOutput}. */
+  protected abstract void writeKey(K key, DataOutput out) throws IOException;
 
-  /** Writes a value into a {@link DataOutputStream}. */
-  protected abstract void writeValue(V value, DataOutputStream out) throws IOException;
+  /** Writes a value into a {@link DataOutput}. */
+  protected abstract void writeValue(V value, DataOutput out) throws IOException;
 
   /**
    * A key/value pair representing the presence or absence of a map entry.

src/test/java/com/google/devtools/build/lib/util/MapCodecTest.java

@@ -22,8 +22,8 @@
 import com.google.devtools.build.lib.vfs.FileSystemUtils;
 import com.google.devtools.build.lib.vfs.Path;
 import com.google.devtools.build.lib.vfs.inmemoryfs.InMemoryFileSystem;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
+import java.io.DataInput;
+import java.io.DataOutput;
 import java.io.IOException;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -39,22 +39,22 @@ public final class MapCodecTest {
   private static final MapCodec<Integer, Integer> TEST_CODEC =
       new MapCodec<Integer, Integer>() {
         @Override
-        protected Integer readKey(DataInputStream in) throws IOException {
+        protected Integer readKey(DataInput in) throws IOException {
           return in.readInt();
         }
 
         @Override
-        protected Integer readValue(DataInputStream in) throws IOException {
+        protected Integer readValue(DataInput in) throws IOException {
           return in.readInt();
         }
 
         @Override
-        protected void writeKey(Integer key, DataOutputStream out) throws IOException {
+        protected void writeKey(Integer key, DataOutput out) throws IOException {
           out.writeInt(key);
         }
 
         @Override
-        protected void writeValue(Integer value, DataOutputStream out) throws IOException {
+        protected void writeValue(Integer value, DataOutput out) throws IOException {
           out.writeInt(value);
         }
       };

src/test/java/com/google/devtools/build/lib/util/PersistentMapTest.java

@@ -19,8 +19,8 @@
 import com.google.devtools.build.lib.testutil.TestThread;
 import com.google.devtools.build.lib.testutil.TestUtils;
 import com.google.devtools.build.lib.vfs.Path;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
+import java.io.DataInput;
+import java.io.DataOutput;
 import java.io.IOException;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
@@ -39,22 +39,22 @@ private static class PersistentStringMap extends PersistentMap<String, String> {
     private static final MapCodec<String, String> CODEC =
         new MapCodec<String, String>() {
           @Override
-          protected String readKey(DataInputStream in) throws IOException {
+          protected String readKey(DataInput in) throws IOException {
             return in.readUTF();
           }
 
           @Override
-          protected String readValue(DataInputStream in) throws IOException {
+          protected String readValue(DataInput in) throws IOException {
             return in.readUTF();
           }
 
           @Override
-          protected void writeKey(String key, DataOutputStream out) throws IOException {
+          protected void writeKey(String key, DataOutput out) throws IOException {
             out.writeUTF(key);
           }
 
           @Override
-          protected void writeValue(String value, DataOutputStream out) throws IOException {
+          protected void writeValue(String value, DataOutput out) throws IOException {
             out.writeUTF(value);
           }
         };