Add logic to use the dynamic cache to WRITE if the DYNAMIC CacheChoic…

…e is selected for the ImageRequest

Reviewed By: oprisnik

Differential Revision: D57387454

fbshipit-source-id: 31996b1fb25fb12adeac6e7b01b803f829c269d4

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

@@ -138,12 +138,26 @@ public void onNewResultImpl(@Nullable EncodedImage newResult, @Status int status
  final ImageRequest imageRequest = mProducerContext.getImageRequest();
  final CacheKey cacheKey =
  mCacheKeyFactory.getEncodedCacheKey(imageRequest, mProducerContext.getCallerContext());
-
- if (imageRequest.getCacheChoice() == ImageRequest.CacheChoice.SMALL) {
- mSmallImageBufferedDiskCache.put(cacheKey, newResult);
- } else {
- mDefaultBufferedDiskCache.put(cacheKey, newResult);
+ BufferedDiskCache bufferedDiskCache =
+ DiskCacheDecision.chooseDiskCacheForRequest(
+ imageRequest,
+ mSmallImageBufferedDiskCache,
+ mDefaultBufferedDiskCache,
+ mDynamicBufferedDiskCaches);
+ if (bufferedDiskCache == null) {
+ mProducerContext
+ .getProducerListener()
+ .onProducerFinishWithFailure(
+ mProducerContext,
+ PRODUCER_NAME,
+ new DiskCacheDecision.DiskCacheDecisionNoDiskCacheChosenException(
+ "Got no disk cache for CacheChoice: "
+ + Integer.valueOf(imageRequest.getCacheChoice().ordinal()).toString()),
+ null);
+ getConsumer().onNewResult(newResult, status);
+ return;
  }
+ bufferedDiskCache.put(cacheKey, newResult);
  mProducerContext
  .getProducerListener()
  .onProducerFinishWithSuccess(mProducerContext, PRODUCER_NAME, null);

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

@@ -10,6 +10,7 @@
 import static org.junit.Assert.assertSame;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.isA;
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
@@ -180,6 +181,44 @@ public void testSmallImageDiskCacheInputProducerSuccess() {
  .onProducerFinishWithSuccess(mProducerContext, PRODUCER_NAME, null);
  }
 
+ @Test
+ public void testDynamicImageDiskCacheInputProducerSuccess() {
+ when(mImageRequest.getCacheChoice()).thenReturn(ImageRequest.CacheChoice.DYNAMIC);
+ when(mImageRequest.getDiskCacheId()).thenReturn(mDiskCacheId2);
+
+ setupInputProducerSuccess();
+ mDiskCacheWriteProducer.produceResults(mConsumer, mProducerContext);
+ verify(mBufferedDiskCache2, never()).put(mCacheKey, mIntermediateEncodedImage);
+ verify(mBufferedDiskCache2).put(mCacheKey, mFinalEncodedImage);
+ verify(mConsumer).onNewResult(mIntermediateEncodedImage, Consumer.NO_FLAGS);
+ verify(mConsumer).onNewResult(mFinalEncodedImage, Consumer.IS_LAST);
+ verify(mProducerListener, times(2)).onProducerStart(mProducerContext, PRODUCER_NAME);
+ verify(mProducerListener, times(2))
+ .onProducerFinishWithSuccess(mProducerContext, PRODUCER_NAME, null);
+ }
+
+ @Test
+ public void testDynamicImageDiskCacheInputProducerFailure_MissingDiskCacheId() {
+ when(mImageRequest.getCacheChoice()).thenReturn(ImageRequest.CacheChoice.DYNAMIC);
+ when(mImageRequest.getDiskCacheId()).thenReturn(null);
+
+ setupInputProducerSuccess();
+ mDiskCacheWriteProducer.produceResults(mConsumer, mProducerContext);
+ verify(mBufferedDiskCache2, never()).put(mCacheKey, mIntermediateEncodedImage);
+ verify(mBufferedDiskCache2, never()).put(mCacheKey, mFinalEncodedImage);
+ verify(mProducerListener, times(1))
+ .onProducerFinishWithFailure(
+ eq(mProducerContext),
+ eq(PRODUCER_NAME),
+ isA(DiskCacheDecision.DiskCacheDecisionNoDiskCacheChosenException.class),
+ eq(null));
+ verify(mConsumer).onNewResult(mIntermediateEncodedImage, Consumer.NO_FLAGS);
+ verify(mConsumer).onNewResult(mFinalEncodedImage, Consumer.IS_LAST);
+ verify(mProducerListener, times(2)).onProducerStart(mProducerContext, PRODUCER_NAME);
+ verify(mProducerListener, times(1))
+ .onProducerFinishWithSuccess(mProducerContext, PRODUCER_NAME, null);
+ }
+
  @Test
  public void testSmallImageDiskCacheInputProducerUnknownFormat() {
  when(mImageRequest.getCacheChoice()).thenReturn(ImageRequest.CacheChoice.SMALL);