Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 338dd5b6 authored by Shubham Ajmera's avatar Shubham Ajmera
Browse files

Port OpenJDK8 changes in java.util.Map 

& add tests.

The CL add tests for map default methods added in Java 8 - getOrDefault,
putIfAbsent, remove(K, V), replace(K, V, V), replace(K, V), forEach,
replaceAll, compute, computeIfAbsent, computeIfPresent, putIfAbsent,
merge.

Methods have been made synchronzed in Hashtable. They are using the
default map methods instead of taking the upstream changes.

Replace(K, V, V) in LinkedHashMap has been  overridden as it doesn't
record access when the replace method doesn't make any replacement.

Bug: 27426743

(cherry-picked from commit 6206c9f2)

Change-Id: Ie27ea5bd42ddbfa751b89f9eacfb290a3d69f4bb
parent 40e1135e

api/current.txt

+10 −1
Original line number Diff line number Diff line
@@ -57950,6 +57950,7 @@ package java.util { 
    method public java.lang.Object clone();

    method public java.util.Set<java.util.Map.Entry<K, V>> entrySet();

    method public void forEach(java.util.function.BiConsumer<? super K, ? super V>);

    method public boolean replace(K, V, V);

  }















  public class HashSet extends java.util.AbstractSet implements java.lang.Cloneable java.io.Serializable java.util.Set {









@@ -57970,6 +57971,9 @@ package java.util {













    ctor public Hashtable(java.util.Map<? extends K, ? extends V>);















    method public synchronized void clear();















    method public synchronized java.lang.Object clone();













    method public synchronized V compute(K, java.util.function.BiFunction<? super K, ? super V, ? extends V>);













    method public synchronized V computeIfAbsent(K, java.util.function.Function<? super K, ? extends V>);













    method public synchronized V computeIfPresent(K, java.util.function.BiFunction<? super K, ? super V, ? extends V>);















    method public synchronized boolean contains(java.lang.Object);















    method public synchronized boolean containsKey(java.lang.Object);















    method public boolean containsValue(java.lang.Object);









@@ -57977,13 +57981,19 @@ package java.util {













    method public java.util.Set<java.util.Map.Entry<K, V>> entrySet();















    method public synchronized void forEach(java.util.function.BiConsumer<? super K, ? super V>);















    method public synchronized V get(java.lang.Object);













    method public synchronized V getOrDefault(java.lang.Object, V);















    method public synchronized boolean isEmpty();















    method public java.util.Set<K> keySet();















    method public synchronized java.util.Enumeration<K> keys();













    method public synchronized V merge(K, V, java.util.function.BiFunction<? super V, ? super V, ? extends V>);















    method public synchronized V put(K, V);















    method public synchronized void putAll(java.util.Map<? extends K, ? extends V>);













    method public synchronized V putIfAbsent(K, V);















    method protected void rehash();















    method public synchronized V remove(java.lang.Object);













    method public synchronized boolean remove(java.lang.Object, java.lang.Object);













    method public synchronized boolean replace(K, V, V);













    method public synchronized V replace(K, V);















    method public synchronized int size();















    method public java.util.Collection<V> values();















  }










@@ -66416,4 +66426,3 @@ package org.xmlpull.v1.sax2 {













  }





























}





































api/system-current.txt



+10
−1




























Original line number
Diff line number
Diff line








@@ -61013,6 +61013,7 @@ package java.util {













    method public java.lang.Object clone();















    method public java.util.Set<java.util.Map.Entry<K, V>> entrySet();















    method public void forEach(java.util.function.BiConsumer<? super K, ? super V>);













    method public boolean replace(K, V, V);















  }





























  public class HashSet extends java.util.AbstractSet implements java.lang.Cloneable java.io.Serializable java.util.Set {









@@ -61033,6 +61034,9 @@ package java.util {













    ctor public Hashtable(java.util.Map<? extends K, ? extends V>);















    method public synchronized void clear();















    method public synchronized java.lang.Object clone();













    method public synchronized V compute(K, java.util.function.BiFunction<? super K, ? super V, ? extends V>);













    method public synchronized V computeIfAbsent(K, java.util.function.Function<? super K, ? extends V>);













    method public synchronized V computeIfPresent(K, java.util.function.BiFunction<? super K, ? super V, ? extends V>);















    method public synchronized boolean contains(java.lang.Object);















    method public synchronized boolean containsKey(java.lang.Object);















    method public boolean containsValue(java.lang.Object);









@@ -61040,13 +61044,19 @@ package java.util {













    method public java.util.Set<java.util.Map.Entry<K, V>> entrySet();















    method public synchronized void forEach(java.util.function.BiConsumer<? super K, ? super V>);















    method public synchronized V get(java.lang.Object);













    method public synchronized V getOrDefault(java.lang.Object, V);















    method public synchronized boolean isEmpty();















    method public java.util.Set<K> keySet();















    method public synchronized java.util.Enumeration<K> keys();













    method public synchronized V merge(K, V, java.util.function.BiFunction<? super V, ? super V, ? extends V>);















    method public synchronized V put(K, V);















    method public synchronized void putAll(java.util.Map<? extends K, ? extends V>);













    method public synchronized V putIfAbsent(K, V);















    method protected void rehash();















    method public synchronized V remove(java.lang.Object);













    method public synchronized boolean remove(java.lang.Object, java.lang.Object);













    method public synchronized boolean replace(K, V, V);













    method public synchronized V replace(K, V);















    method public synchronized int size();















    method public java.util.Collection<V> values();















  }










@@ -69479,4 +69489,3 @@ package org.xmlpull.v1.sax2 {













  }





























}





































api/test-current.txt



+10
−1




























Original line number
Diff line number
Diff line








@@ -58024,6 +58024,7 @@ package java.util {













    method public java.lang.Object clone();















    method public java.util.Set<java.util.Map.Entry<K, V>> entrySet();















    method public void forEach(java.util.function.BiConsumer<? super K, ? super V>);













    method public boolean replace(K, V, V);















  }





























  public class HashSet extends java.util.AbstractSet implements java.lang.Cloneable java.io.Serializable java.util.Set {









@@ -58044,6 +58045,9 @@ package java.util {













    ctor public Hashtable(java.util.Map<? extends K, ? extends V>);















    method public synchronized void clear();















    method public synchronized java.lang.Object clone();













    method public synchronized V compute(K, java.util.function.BiFunction<? super K, ? super V, ? extends V>);













    method public synchronized V computeIfAbsent(K, java.util.function.Function<? super K, ? extends V>);













    method public synchronized V computeIfPresent(K, java.util.function.BiFunction<? super K, ? super V, ? extends V>);















    method public synchronized boolean contains(java.lang.Object);















    method public synchronized boolean containsKey(java.lang.Object);















    method public boolean containsValue(java.lang.Object);









@@ -58051,13 +58055,19 @@ package java.util {













    method public java.util.Set<java.util.Map.Entry<K, V>> entrySet();















    method public synchronized void forEach(java.util.function.BiConsumer<? super K, ? super V>);















    method public synchronized V get(java.lang.Object);













    method public synchronized V getOrDefault(java.lang.Object, V);















    method public synchronized boolean isEmpty();















    method public java.util.Set<K> keySet();















    method public synchronized java.util.Enumeration<K> keys();













    method public synchronized V merge(K, V, java.util.function.BiFunction<? super V, ? super V, ? extends V>);















    method public synchronized V put(K, V);















    method public synchronized void putAll(java.util.Map<? extends K, ? extends V>);













    method public synchronized V putIfAbsent(K, V);















    method protected void rehash();















    method public synchronized V remove(java.lang.Object);













    method public synchronized boolean remove(java.lang.Object, java.lang.Object);













    method public synchronized boolean replace(K, V, V);













    method public synchronized V replace(K, V);















    method public synchronized int size();















    method public java.util.Collection<V> values();















  }










@@ -66490,4 +66500,3 @@ package org.xmlpull.v1.sax2 {













  }





























}