don't unnesessarily constrain type of getIfPresent and getAllPresent …

…parameters ------------- Created by MOE: http://code.google.com/p/moe-java MOE_MIGRATED_REVID=28374192
haofu91 · Mar 14, 2012 · 9eed063 · 9eed063
1 parent 1678fdb
commit 9eed063
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 16 deletions.
diff --git a/guava-gwt/src-super/com/google/common/cache/super/com/google/common/cache/CacheBuilder.java b/guava-gwt/src-super/com/google/common/cache/super/com/google/common/cache/CacheBuilder.java
@@ -127,7 +127,7 @@ protected LocalManualCache(CacheBuilder<? super K, ? super V> builder,
 
     @Override
     @Nullable
-    public V getIfPresent(K key) {
+    public V getIfPresent(Object key) {
       return localCache.get(key);
     }
 

diff --git a/guava-tests/test/com/google/common/cache/AbstractCacheTest.java b/guava-tests/test/com/google/common/cache/AbstractCacheTest.java
@@ -53,7 +53,7 @@ public void testInvalidateAll() {
     final List<Object> invalidated = Lists.newArrayList();
     Cache<Integer, Integer> cache = new AbstractCache<Integer, Integer>() {
       @Override
-      public Integer getIfPresent(Integer key) {
+      public Integer getIfPresent(Object key) {
         throw new UnsupportedOperationException();
       }
 

diff --git a/guava/src/com/google/common/cache/AbstractCache.java b/guava/src/com/google/common/cache/AbstractCache.java
@@ -57,14 +57,22 @@ public V get(K key, Callable<? extends V> valueLoader) throws ExecutionException
   }
 
   /**
+   * This implementation of {@code getAllPresent} lacks any insight into the internal cache data
+   * structure, and is thus forced to return the query keys instead of the cached keys. This is only
+   * possible with an unsafe cast which requires {@code keys} to actually be of type {@code K}.
+   *
+   * {@inheritDoc}
+   *
    * @since 11.0
    */
   @Override
-  public ImmutableMap<K, V> getAllPresent(Iterable<? extends K> keys) {
+  public ImmutableMap<K, V> getAllPresent(Iterable<?> keys) {
     Map<K, V> result = Maps.newLinkedHashMap();
-    for (K key : keys) {
+    for (Object key : keys) {
       if (!result.containsKey(key)) {
-        result.put(key, getIfPresent(key));
+        @SuppressWarnings("unchecked")
+        K castKey = (K) key;
+        result.put(castKey, getIfPresent(key));
       }
     }
     return ImmutableMap.copyOf(result);

diff --git a/guava/src/com/google/common/cache/Cache.java b/guava/src/com/google/common/cache/Cache.java
@@ -56,7 +56,7 @@ public interface Cache<K, V> {
    * @since 11.0
    */
   @Nullable
-  V getIfPresent(K key);
+  V getIfPresent(Object key);
 
   /**
    * Returns the value associated with {@code key} in this cache, obtaining that value from
@@ -82,7 +82,7 @@ public interface Cache<K, V> {
    *
    * @since 11.0
    */
-  ImmutableMap<K, V> getAllPresent(Iterable<? extends K> keys);
+  ImmutableMap<K, V> getAllPresent(Iterable<?> keys);
 
   /**
    * Associates {@code value} with {@code key} in this cache. If the cache previously contained a

diff --git a/guava/src/com/google/common/cache/ForwardingCache.java b/guava/src/com/google/common/cache/ForwardingCache.java
@@ -50,7 +50,7 @@ protected ForwardingCache() {}
    */
   @Override
   @Nullable
-  public V getIfPresent(K key) {
+  public V getIfPresent(Object key) {
     return delegate().getIfPresent(key);
   }
 
@@ -66,7 +66,7 @@ public V get(K key, Callable<? extends V> valueLoader) throws ExecutionException
    * @since 11.0
    */
   @Override
-  public ImmutableMap<K, V> getAllPresent(Iterable<? extends K> keys) {
+  public ImmutableMap<K, V> getAllPresent(Iterable<?> keys) {
     return delegate().getAllPresent(keys);
   }
 

diff --git a/guava/src/com/google/common/cache/LocalCache.java b/guava/src/com/google/common/cache/LocalCache.java
@@ -3969,17 +3969,20 @@ V getOrLoad(K key) throws ExecutionException {
     return get(key, defaultLoader);
   }
 
-  ImmutableMap<K, V> getAllPresent(Iterable<? extends K> keys) {
+  ImmutableMap<K, V> getAllPresent(Iterable<?> keys) {
     int hits = 0;
     int misses = 0;
 
     Map<K, V> result = Maps.newLinkedHashMap();
-    for (K key : keys) {
+    for (Object key : keys) {
       V value = get(key);
       if (value == null) {
         misses++;
       } else {
-        result.put(key, value);
+        // TODO(fry): store entry key instead of query key
+        @SuppressWarnings("unchecked")
+        K castKey = (K) key;
+        result.put(castKey, value);
         hits++;
       }
     }
@@ -3988,8 +3991,7 @@ ImmutableMap<K, V> getAllPresent(Iterable<? extends K> keys) {
     return ImmutableMap.copyOf(result);
   }
 
-  ImmutableMap<K, V> getAll(Iterable<? extends K> keys)
-      throws ExecutionException {
+  ImmutableMap<K, V> getAll(Iterable<? extends K> keys) throws ExecutionException {
     int hits = 0;
     int misses = 0;
 
@@ -4754,7 +4756,7 @@ protected LocalManualCache(CacheBuilder<? super K, ? super V> builder,
 
     @Override
     @Nullable
-    public V getIfPresent(K key) {
+    public V getIfPresent(Object key) {
       return localCache.getIfPresent(key);
     }
 
@@ -4770,7 +4772,7 @@ public V load(Object key) throws Exception {
     }
 
     @Override
-    public ImmutableMap<K, V> getAllPresent(Iterable<? extends K> keys) {
+    public ImmutableMap<K, V> getAllPresent(Iterable<?> keys) {
       return localCache.getAllPresent(keys);
     }