Add ImmutableMap.getOrDefault() in the Android branch.

[] ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=176589307
google · Nov 22, 2017 · 1e4938c · jbduncan · Nov 22, 2017 · cpovirk
1 parent dc32104
commit 1e4938c
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 0 deletions.
diff --git a/android/guava/src/com/google/common/collect/ImmutableMap.java b/android/guava/src/com/google/common/collect/ImmutableMap.java
@@ -500,6 +500,23 @@ public boolean containsValue(@Nullable Object value) {
   @Override
   public abstract V get(@Nullable Object key);
 
+  /**
+   * {@inheritDoc}
+   *
+   * <p>See <a
+   * href="https://developer.android.com/reference/java/util/Map.html#getOrDefault%28java.lang.Object,%20V%29">{@code
+   * Map.getOrDefault}</a>.
+   *
+   * @since 23.5 (but since 21.0 in the JRE <a
+   *     href="https://github.com/google/guava#guava-google-core-libraries-for-java">flavor</a>).
+   *     Note that API Level 24 users can call this method with any version of Guava.
+   */
+  // @Override under Java 8 / API Level 24
+  public final V getOrDefault(@Nullable Object key, @Nullable V defaultValue) {
+    V result = get(key);
+    return (result != null) ? result : defaultValue;
+  }
+
   @LazyInit private transient ImmutableSet<Entry<K, V>> entrySet;
 
   /**

diff --git a/guava/src/com/google/common/collect/ImmutableMap.java b/guava/src/com/google/common/collect/ImmutableMap.java
@@ -681,6 +681,11 @@ public boolean containsValue(@Nullable Object value) {
   @Override
   public abstract V get(@Nullable Object key);
 
+  /**
+   * @since 21.0 (but only since 23.5 in the Android <a
+   *     href="https://github.com/google/guava#guava-google-core-libraries-for-java">flavor</a>).
+   *     Note, however, that Java 8 users can call this method with any version and flavor of Guava.
+   */
   @Override
   public final V getOrDefault(@Nullable Object key, @Nullable V defaultValue) {
     V result = get(key);