Emulation for io, Collections and MessageDigestSpi

Author: zbynek

build_tools/doctool/src/com/google/doctool/custom/missing/gh10221.properties

@@ -11,25 +11,6 @@ java.util.Arrays#compareUnsigned(int[], int, int, int[], int, int)\
 java.util.Arrays#compareUnsigned(long[], int, int, long[], int, int)\
 java.util.Arrays#compareUnsigned(short[], int, int, short[], int, int)\
 java.util.Arrays#compareUnsigned(int[], int[])\
-java.util.Collections#emptyEnumeration()\
-java.util.Collections#indexOfSubList(List, List)\
-java.util.Collections#lastIndexOfSubList(List, List)\
-java.util.Collections#unmodifiableNavigableSet(NavigableSet)\
-java.util.Collections#unmodifiableNavigableMap(NavigableMap)\
-java.util.Collections#emptySortedSet()\
-java.util.Collections#emptyNavigableSet()\
-java.util.Collections#emptySortedMap()\
-java.util.Collections#emptyNavigableMap()\
-java.io.InputStream#readAllBytes()\
-java.io.InputStream#readNBytes(int)\
-java.io.InputStream#readNBytes(byte[], int, int)\
-java.io.InputStream#transferTo(OutputStream)\
-java.io.InputStream#nullInputStream()\
-java.io.InputStream#skipNBytes(long)\
-java.io.PrintStream#writeBytes(byte[])\
-java.io.Reader#nullReader()\
-java.io.Reader#transferTo(Writer)\
-java.security.MessageDigestSpi#clone()\
 java.lang.Double#toHexString(double)\
 java.lang.Float#toHexString(float)\
 java.lang.System#lineSeparator()

user/super/com/google/gwt/emul/java/io/ByteArrayInputStream.java

@@ -184,7 +184,7 @@ public long skip(long byteCount) {
             return 0;
         }
         int temp = pos;
-        pos = this.count - pos < byteCount ? this.count : (int) (pos + byteCount);
+        pos = this.count < pos + byteCount ? this.count : (int) (pos + byteCount);
         return pos - temp;
     }
 }

user/super/com/google/gwt/emul/java/io/InputStream.java

@@ -21,6 +21,8 @@
 
 import static javaemul.internal.InternalPreconditions.checkNotNull;
 
+import java.util.Arrays;
+
 /**
  * A readable source of bytes.
  *
@@ -203,6 +205,69 @@ public int read(byte[] buffer, int byteOffset, int byteCount) throws IOException
         return byteCount;
     }
 
+    public byte[] readAllBytes() throws IOException {
+        return readNBytes(0, Integer.MAX_VALUE);
+    }
+
+    public byte[] readNBytes(int len) throws IOException {
+        return readNBytes(0, len);
+    }
+
+    public byte[] readNBytes(int off, int len) throws IOException {
+        if (len == 0) {
+            return new byte[0];
+        }
+        skipNBytes(off);
+        int capacity = Math.min(len, Math.max(2048, available()));
+        byte[] buffer = new byte[capacity];
+        int pos = 0;
+        while (pos <= len) {
+            int chunk = read(buffer, pos, capacity - pos);
+            if (chunk == 0) {
+                break;
+            }
+            pos += chunk;
+            if (pos == capacity) {
+                capacity = Math.min(len, 2 * capacity);
+                buffer = Arrays.copyOf(buffer, capacity);
+            }
+        }
+
+        return pos < len ? Arrays.copyOf(buffer, pos) : buffer;
+    }
+
+    public int readNBytes(byte[] buffer, int off, int len) throws IOException {
+        if (len == 0) {
+            return 0;
+        }
+        skipNBytes(off);
+        int pos = 0;
+        while (pos <= len) {
+            int chunk = read(buffer, pos, len);
+            if (chunk == 0) {
+                break;
+            }
+            pos += chunk;
+        }
+
+        return pos;
+    }
+
+    public void skipNBytes(long n) throws IOException {
+        long skipped = 0;
+        while (skipped < n) {
+            long chunk = skip(n);
+            if (chunk == 0) {
+                if (read() >= 0) {
+                    skipped++;
+                } else {
+                    throw new IOException("End of stream reached");
+                }
+            }
+            skipped += chunk;
+        }
+    }
+
     /**
      * Resets this stream to the last marked location. Throws an
      * {@code IOException} if the number of bytes read since the mark has been
@@ -256,4 +321,31 @@ public long skip(long byteCount) throws IOException {
         }
         return skipped;
     }
+
+    public void transferTo(OutputStream writer) throws IOException {
+        byte[] buffer = new byte[2048];
+        int read;
+        while ((read = read(buffer)) > 0) {
+            writer.write(buffer, 0, read);
+        }
+    }
+
+    public static InputStream nullInputStream() {
+        return new InputStream() {
+            private boolean closed;
+
+            @Override
+            public int read() throws IOException {
+                if (closed) {
+                    throw new IOException("Already closed");
+                }
+                return -1;
+            }
+
+            @Override
+            public void close() {
+                closed = true;
+            }
+        };
+    }
 }

user/super/com/google/gwt/emul/java/io/PrintStream.java

@@ -145,6 +145,10 @@ public void close() {
     }
   }
 
+  public void writeBytes(byte[] buffer) {
+    write(buffer, 0, buffer.length);
+  }
+
   @Override
   public void write(byte[] buffer, int offset, int length) {
     // Force buffer null check first!

user/super/com/google/gwt/emul/java/io/Reader.java

@@ -99,4 +99,31 @@ public long skip(long n) throws IOException {
     }
     return n - remaining;
   }
+
+  public void transferTo(Writer writer) throws IOException {
+    char[] buffer = new char[1024];
+    int read;
+    while ((read = read(buffer)) > 0) {
+      writer.write(buffer, 0, read);
+    }
+  }
+
+  public static Reader nullReader() {
+    return new Reader() {
+      private boolean closed;
+
+      @Override
+      public int read(char[] cbuf, int off, int len) throws IOException {
+        if (closed) {
+          throw new IOException("Already closed");
+        }
+        return 0;
+      }
+
+      @Override
+      public void close() throws IOException {
+        closed = true;
+      }
+    };
+  }
 }

user/super/com/google/gwt/emul/java/security/MessageDigest.java

@@ -17,6 +17,8 @@
 
 import static javaemul.internal.Coercions.ensureInt;
 
+import java.util.Arrays;
+
 /**
  * Message Digest algorithm - <a href=
  * "http://java.sun.com/j2se/1.4.2/docs/api/java/security/MessageDigest.html"
@@ -265,6 +267,15 @@ protected void engineReset() {
       remainder = 64;
     }
 
+    public Object clone() {
+      Md5Digest copy = new Md5Digest();
+      copy.buffer = Arrays.copyOf(buffer, buffer.length);
+      copy.state = Arrays.copyOf(state, state.length);
+      copy.counter = counter;
+      copy.remainder = remainder;
+      return copy;
+    }
+
     @Override
     protected void engineUpdate(byte input) {
       // TODO(jat): better implementation

user/super/com/google/gwt/emul/java/security/MessageDigestSpi.java

@@ -36,6 +36,10 @@ protected int engineDigest(byte[] buf, int offset, int len)
     System.arraycopy(digest, 0, buf, offset, digest.length);
     return digest.length;
   }
+
+  public Object clone() throws CloneNotSupportedException {
+    throw new CloneNotSupportedException();
+  }
 
   protected int engineGetDigestLength() {
     return 0;

user/super/com/google/gwt/emul/java/security/SHA256Digest.java

@@ -66,6 +66,16 @@ protected void engineReset() {
     byteCounter = 0;
   }
 
+  public Object clone() {
+    SHA256Digest copy = new SHA256Digest();
+    copy.wordBuffer = Arrays.copyOf(wordBuffer, wordBuffer.length);
+    copy.blockBuffer = Arrays.copyOf(blockBuffer, blockBuffer.length);
+    copy.wordOff = wordOff;
+    copy.byteCounter = byteCounter;
+    copy.blockOff = blockOff;
+    return copy;
+  }
+
   @Override
   protected void engineUpdate(byte input) {
     wordBuffer[wordOff] = input;