diff options
| author | Philip P. Moltmann <moltmann@google.com> | 2018-08-28 16:38:37 +0000 |
|---|---|---|
| committer | Philip P. Moltmann <moltmann@google.com> | 2018-08-28 16:38:37 +0000 |
| commit | 0a0255ce0b22e9660bef08a4c5041c7f6a9667c7 (patch) | |
| tree | 0bf87e4d2caf0e63a07c8f5e22aef3d31ac6a82c /src/main/java/org/mockito/internal/util | |
| parent | 31b8dd0cbc0246fdab7ec2e9d1fd9fc822eac46d (diff) | |
| download | mockito-0a0255ce0b22e9660bef08a4c5041c7f6a9667c7.tar.gz | |
Revert "Update mockito on AOSP to same version as on internal master"
This reverts commit 31b8dd0cbc0246fdab7ec2e9d1fd9fc822eac46d.
Reason for revert: Breaks errorprone build
Change-Id: Iaf0e1154a109d435ade1b45b1518e178228bfb67
Diffstat (limited to 'src/main/java/org/mockito/internal/util')
| -rw-r--r-- | src/main/java/org/mockito/internal/util/Primitives.java | 2 | ||||
| -rw-r--r-- | src/main/java/org/mockito/internal/util/concurrent/WeakConcurrentMap.java | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/src/main/java/org/mockito/internal/util/Primitives.java b/src/main/java/org/mockito/internal/util/Primitives.java index 80dd0af..4d813e3 100644 --- a/src/main/java/org/mockito/internal/util/Primitives.java +++ b/src/main/java/org/mockito/internal/util/Primitives.java @@ -44,7 +44,7 @@ public class Primitives { public static boolean isAssignableFromWrapper(Class<?> valueClass, Class<?> referenceType) { if(isPrimitiveOrWrapper(valueClass) && isPrimitiveOrWrapper(referenceType)) { - return Primitives.primitiveTypeOf(valueClass).isAssignableFrom(Primitives.primitiveTypeOf(referenceType)); + return Primitives.primitiveTypeOf(valueClass).isAssignableFrom(referenceType); } return false; } diff --git a/src/main/java/org/mockito/internal/util/concurrent/WeakConcurrentMap.java b/src/main/java/org/mockito/internal/util/concurrent/WeakConcurrentMap.java index 487d223..b411a73 100644 --- a/src/main/java/org/mockito/internal/util/concurrent/WeakConcurrentMap.java +++ b/src/main/java/org/mockito/internal/util/concurrent/WeakConcurrentMap.java @@ -50,7 +50,6 @@ public class WeakConcurrentMap<K, V> extends ReferenceQueue<K> implements Runnab * @param key The key of the entry. * @return The value of the entry or the default value if it did not exist. */ - @SuppressWarnings("CollectionIncompatibleType") public V get(K key) { if (key == null) throw new NullPointerException(); V value = target.get(new LatentKey<K>(key)); @@ -70,7 +69,6 @@ public class WeakConcurrentMap<K, V> extends ReferenceQueue<K> implements Runnab * @param key The key of the entry. * @return {@code true} if the key already defines a value. */ - @SuppressWarnings("CollectionIncompatibleType") public boolean containsKey(K key) { if (key == null) throw new NullPointerException(); return target.containsKey(new LatentKey<K>(key)); @@ -90,7 +88,6 @@ public class WeakConcurrentMap<K, V> extends ReferenceQueue<K> implements Runnab * @param key The key of the entry. * @return The removed entry or {@code null} if it does not exist. */ - @SuppressWarnings("CollectionIncompatibleType") public V remove(K key) { if (key == null) throw new NullPointerException(); return target.remove(new LatentKey<K>(key)); |