Pass in cacheId -> BufferedDiskCache map to DiskCacheReadProducer

Reviewed By: oprisnik

Differential Revision: D57360818

fbshipit-source-id: 8af27c7c72e84bf486c7db5fc76755ea16a51924

imagepipeline/src/main/java/com/facebook/imagepipeline/core/ProducerFactory.java

@@ -274,7 +274,11 @@ public DecodeProducer newDecodeProducer(Producer<EncodedImage> inputProducer) {
 
  public DiskCacheReadProducer newDiskCacheReadProducer(Producer<EncodedImage> inputProducer) {
  return new DiskCacheReadProducer(
- mDefaultBufferedDiskCache, mSmallImageBufferedDiskCache, mCacheKeyFactory, inputProducer);
+ mDefaultBufferedDiskCache,
+ mSmallImageBufferedDiskCache,
+ mDynamicBufferedDiskCaches,
+ mCacheKeyFactory,
+ inputProducer);
  }
 
  public DiskCacheWriteProducer newDiskCacheWriteProducer(Producer<EncodedImage> inputProducer) {

imagepipeline/src/main/java/com/facebook/imagepipeline/producers/DiskCacheReadProducer.java

@@ -49,13 +49,17 @@ public class DiskCacheReadProducer implements Producer<EncodedImage> {
  private final CacheKeyFactory mCacheKeyFactory;
  private final Producer<EncodedImage> mInputProducer;
 
+ private final @Nullable Map<String, BufferedDiskCache> mDynamicBufferedDiskCaches;
+
  public DiskCacheReadProducer(
  BufferedDiskCache defaultBufferedDiskCache,
  BufferedDiskCache smallImageBufferedDiskCache,
+ @Nullable Map<String, BufferedDiskCache> dynamicBufferedDiskCaches,
  CacheKeyFactory cacheKeyFactory,
  Producer<EncodedImage> inputProducer) {
  mDefaultBufferedDiskCache = defaultBufferedDiskCache;
  mSmallImageBufferedDiskCache = smallImageBufferedDiskCache;
+ mDynamicBufferedDiskCaches = dynamicBufferedDiskCaches;
  mCacheKeyFactory = cacheKeyFactory;
  mInputProducer = inputProducer;
  }

imagepipeline/src/test/java/com/facebook/imagepipeline/producers/DiskCacheReadProducerTest.java

@@ -61,6 +61,12 @@ public class DiskCacheReadProducerTest {
  @Mock public ImagePipelineConfig mConfig;
  private final BufferedDiskCache mDefaultBufferedDiskCache = mock(BufferedDiskCache.class);
  private final BufferedDiskCache mSmallImageBufferedDiskCache = mock(BufferedDiskCache.class);
+ private final String mDiskCacheId1 = "DISK_CACHE_ID_1";
+ private final BufferedDiskCache mBufferedDiskCache1 = mock(BufferedDiskCache.class);
+ private final String mDiskCacheId2 = "DISK_CACHE_ID_2";
+ private final BufferedDiskCache mBufferedDiskCache2 = mock(BufferedDiskCache.class);
+ private final Map<String, BufferedDiskCache> mDynamicBufferedDiskCaches =
+ ImmutableMap.of(mDiskCacheId1, mBufferedDiskCache1, mDiskCacheId2, mBufferedDiskCache2);
  private SettableProducerContext mProducerContext;
  private SettableProducerContext mLowestLevelProducerContext;
  private final String mRequestId = "mRequestId";
@@ -82,6 +88,7 @@ public void setUp() {
  new DiskCacheReadProducer(
  mDefaultBufferedDiskCache,
  mSmallImageBufferedDiskCache,
+ mDynamicBufferedDiskCaches,
  mCacheKeyFactory,
  mInputProducer);
  List<CacheKey> keys = new ArrayList<>(1);