Add emulation for Java 9 additions to Objects class

Author: zbynek

user/super/com/google/gwt/emul/java/util/Objects.java

@@ -129,6 +129,37 @@ public static <T> T requireNonNull(T obj, Supplier<String> messageSupplier) {
     return obj;
   }
 
+  public static <T> T requireNonNullElse(T obj, T defaultObj) {
+    return obj != null ? obj : requireNonNull(defaultObj);
+  }
+
+  public static <T> T requireNonNullElseGet(T obj, Supplier<? extends T> supplier) {
+    return obj != null ? obj : requireNonNull(supplier.get());
+  }
+
+  public static int checkIndex(int index, int length) {
+    if (index < 0 || index >= length) {
+      new IndexOutOfBoundsException("Index " + index + " out of bounds for length " + length);
+    }
+    return index;
+  }
+
+  public static int checkFromToIndex(int fromIndex, int toIndex, int length) {
+    if (fromIndex < 0 || fromIndex > toIndex || toIndex > length) {
+      new IndexOutOfBoundsException("Range [" + fromIndex + ", " + toIndex
+          + ") out of bounds for length " + length);
+    }
+    return index;
+  }
+
+  public static int checkFromIndexSize(long fromIndex, long size, long length) {
+    if (fromIndex < 0 || size < 0 || fromIndex + size > length) {
+      new IndexOutOfBoundsException("Range [" + fromIndex + ", " + (fromIndex + size)
+          + ") out of bounds for length " + length);
+    }
+    return index;
+  }
+
   public static String toString(Object o) {
     return String.valueOf(o);
   }

user/test/com/google/gwt/emultest/java/util/ObjectsTest.java

@@ -102,4 +102,62 @@ public void testHashCode() {
     Object obj = new Object();
     assertEquals(obj.hashCode(), Objects.hashCode(obj));
   }
+
+  public void testRequireNonNull() {
+    assertEquals("foo", Objects.requireNonNull("foo"));
+    assertThrows(NullPointerException.class,
+        () -> Objects.requireNonNull(null));
+  }
+
+  public void testRequireNonNullElse() {
+    assertEquals("foo", Objects.requireNonNullElse("foo", "bar"));
+    assertThrows(NullPointerException.class,
+        () -> Objects.requireNonNullElse(null, null));
+  }
+
+  public void testRequireNonNullElseGet() {
+    assertEquals("foo", Objects.requireNonNullElseGet("foo", () -> "bar"));
+    assertThrows(NullPointerException.class,
+        () -> Objects.requireNonNullElseGet(null, null));
+    assertThrows(NullPointerException.class,
+        () -> Objects.requireNonNullElseGet(null, () -> null));
+  }
+
+  public void testCheckIndex() {
+    assertEquals(5, Objects.checkIndex(5, 10));
+    assertThrows(IndexOutOfBoundsException.class,
+        () -> Objects.checkIndex(-5, 5));
+    assertThrows(IndexOutOfBoundsException.class,
+        () -> Objects.checkIndex(10, 5));
+  }
+
+  public void testCheckFromToIndex() {
+    assertEquals(5, Objects.checkFromToIndex(5, 7, 10));
+    assertThrows(IndexOutOfBoundsException.class,
+        () -> Objects.checkFromToIndex(-5, 1, 5));
+    assertThrows(IndexOutOfBoundsException.class,
+        () -> Objects.checkFromToIndex(10, 1,  5));
+    assertThrows(IndexOutOfBoundsException.class,
+        () -> Objects.checkFromToIndex(1, 10,  5));
+  }
+
+  public void testCheckFromIndexSize() {
+    assertEquals(5, Objects.checkFromIndexSize(5, 2, 10));
+    assertThrows(IndexOutOfBoundsException.class,
+        () -> Objects.checkFromIndexSize(-5, 1, 5));
+    assertThrows(IndexOutOfBoundsException.class,
+        () -> Objects.checkFromIndexSize(10, 1,  5));
+    assertThrows(IndexOutOfBoundsException.class,
+        () -> Objects.checkFromIndexSize(1, 10,  5));
+  }
+
+  private void assertThrows(Class<? extends Exception> thrownCheck, Runnable toTest) {
+    try {
+      toTest.run();
+      fail("Should have failed");
+    } catch (Exception ex) {
+      assertEquals(ex.getClass(), thrownCheck);
+    }
+
+  }
 }