From d840533448fd7bde528e0af7ce10c49653430c12 Mon Sep 17 00:00:00 2001 From: judds Date: Thu, 7 Dec 2017 15:22:19 -0800 Subject: [PATCH] Remove deprecated constructor in FitCenter ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=178304408 --- .../androidTest/java/com/bumptech/glide/CachingTest.java | 5 ++--- .../java/com/bumptech/glide/LoadBytesTest.java | 3 +-- .../bumptech/glide/load/resource/bitmap/FitCenter.java | 9 --------- 3 files changed, 3 insertions(+), 14 deletions(-) diff --git a/instrumentation/src/androidTest/java/com/bumptech/glide/CachingTest.java b/instrumentation/src/androidTest/java/com/bumptech/glide/CachingTest.java index 4c6ec95365..3002243ca0 100644 --- a/instrumentation/src/androidTest/java/com/bumptech/glide/CachingTest.java +++ b/instrumentation/src/androidTest/java/com/bumptech/glide/CachingTest.java @@ -46,7 +46,6 @@ import org.junit.Test; import org.junit.function.ThrowingRunnable; import org.junit.runner.RunWith; -import org.mockito.ArgumentMatchers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; @@ -395,7 +394,7 @@ public void run() { verify(requestListener) .onResourceReady( anyDrawable(), - ArgumentMatchers.any(), + any(), anyDrawableTarget(), eq(DataSource.MEMORY_CACHE), anyBoolean()); @@ -433,7 +432,7 @@ public void loadIntoView_withSkipMemoryCache_doesNotLoadFromMemoryCacheIfPresent verify(requestListener) .onResourceReady( anyDrawable(), - ArgumentMatchers.any(), + any(), anyDrawableTarget(), not(eq(DataSource.MEMORY_CACHE)), anyBoolean()); diff --git a/instrumentation/src/androidTest/java/com/bumptech/glide/LoadBytesTest.java b/instrumentation/src/androidTest/java/com/bumptech/glide/LoadBytesTest.java index 4c2b90af3c..b6abc374d8 100644 --- a/instrumentation/src/androidTest/java/com/bumptech/glide/LoadBytesTest.java +++ b/instrumentation/src/androidTest/java/com/bumptech/glide/LoadBytesTest.java @@ -43,7 +43,6 @@ import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.ArgumentMatchers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; @@ -486,7 +485,7 @@ public void loadFromBuilder_withDataDiskCacheStrategy_returnsFromSource() throws verify(requestListener).onResourceReady( anyDrawable(), - ArgumentMatchers.any(), + any(), anyDrawableTarget(), eq(DataSource.DATA_DISK_CACHE), anyBoolean()); diff --git a/library/src/main/java/com/bumptech/glide/load/resource/bitmap/FitCenter.java b/library/src/main/java/com/bumptech/glide/load/resource/bitmap/FitCenter.java index 8a584cb793..06e690d62f 100644 --- a/library/src/main/java/com/bumptech/glide/load/resource/bitmap/FitCenter.java +++ b/library/src/main/java/com/bumptech/glide/load/resource/bitmap/FitCenter.java @@ -1,6 +1,5 @@ package com.bumptech.glide.load.resource.bitmap; -import android.content.Context; import android.graphics.Bitmap; import android.support.annotation.NonNull; import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool; @@ -19,14 +18,6 @@ public FitCenter() { // Intentionally empty. } - /** - * @deprecated Use {@link #FitCenter()}. - */ - @Deprecated - public FitCenter(@SuppressWarnings("unused") Context context) { - this(); - } - @Override protected Bitmap transform(@NonNull BitmapPool pool, @NonNull Bitmap toTransform, int outWidth, int outHeight) {