Move resource into Engine package.

library/src/main/java/com/bumptech/glide/load/MultiTransformation.java

 package com.bumptech.glide.load;
 
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 
 import java.util.List;
 

library/src/main/java/com/bumptech/glide/load/ResourceDecoder.java

 package com.bumptech.glide.load;
 
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 
 import java.io.IOException;
 

library/src/main/java/com/bumptech/glide/load/ResourceEncoder.java

 package com.bumptech.glide.load;
 
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 
 import java.io.OutputStream;
 

library/src/main/java/com/bumptech/glide/load/SkipCache.java

 package com.bumptech.glide.load;
 
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 
 import java.io.OutputStream;
 

library/src/main/java/com/bumptech/glide/load/Transformation.java

 package com.bumptech.glide.load;
 
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 
 /**
  * A class for performing an arbitrary transformation on a bitmap

library/src/main/java/com/bumptech/glide/load/engine/Engine.java

@@ -5,7 +5,6 @@ import android.os.Looper;
 import android.os.MessageQueue;
 import android.util.Log;
 import com.bumptech.glide.Priority;
-import com.bumptech.glide.Resource;
 import com.bumptech.glide.load.Key;
 import com.bumptech.glide.load.ResourceDecoder;
 import com.bumptech.glide.load.ResourceEncoder;

library/src/main/java/com/bumptech/glide/load/engine/EngineJob.java

@@ -2,7 +2,6 @@ package com.bumptech.glide.load.engine;
 
 import android.os.Handler;
 import android.util.Log;
-import com.bumptech.glide.Resource;
 import com.bumptech.glide.load.Key;
 import com.bumptech.glide.request.ResourceCallback;
 import com.bumptech.glide.util.LogTime;

library/src/main/java/com/bumptech/glide/load/engine/EngineJobListener.java

 package com.bumptech.glide.load.engine;
 
-import com.bumptech.glide.Resource;
 import com.bumptech.glide.load.Key;
 
 public interface EngineJobListener {

library/src/main/java/com/bumptech/glide/Resource.java → library/src/main/java/com/bumptech/glide/load/engine/Resource.java

-package com.bumptech.glide;
+package com.bumptech.glide.load.engine;
 
 import android.os.Looper;
 import com.bumptech.glide.load.Key;
@@ -18,7 +18,7 @@ public abstract class Resource<Z> {
     private Key key;
     private boolean isCacheable;
 
-    public interface ResourceListener {
+    interface ResourceListener {
         public void onResourceReleased(Key key, Resource resource);
     }
 
@@ -28,16 +28,16 @@ public abstract class Resource<Z> {
 
     protected abstract void recycleInternal();
 
-    public void setResourceListener(Key key, ResourceListener listener) {
+    void setResourceListener(Key key, ResourceListener listener) {
         this.key = key;
         this.listener = listener;
     }
 
-    public void setCacheable(boolean isCacheable) {
+    void setCacheable(boolean isCacheable) {
         this.isCacheable = isCacheable;
     }
 
-    public boolean isCacheable() {
+    boolean isCacheable() {
         return isCacheable;
     }
 

library/src/main/java/com/bumptech/glide/load/engine/ResourceRunner.java

@@ -3,7 +3,6 @@ package com.bumptech.glide.load.engine;
 import android.os.SystemClock;
 import android.util.Log;
 import com.bumptech.glide.Priority;
-import com.bumptech.glide.Resource;
 import com.bumptech.glide.load.Key;
 import com.bumptech.glide.load.ResourceDecoder;
 import com.bumptech.glide.load.Transformation;

library/src/main/java/com/bumptech/glide/load/engine/SourceResourceRunner.java

@@ -3,7 +3,6 @@ package com.bumptech.glide.load.engine;
 import android.os.SystemClock;
 import android.util.Log;
 import com.bumptech.glide.Priority;
-import com.bumptech.glide.Resource;
 import com.bumptech.glide.load.Key;
 import com.bumptech.glide.load.ResourceDecoder;
 import com.bumptech.glide.load.ResourceEncoder;

library/src/main/java/com/bumptech/glide/load/engine/cache/LruResourceCache.java

 package com.bumptech.glide.load.engine.cache;
 
 import com.bumptech.glide.load.Key;
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 import com.bumptech.glide.util.LruCache;
 
 import static android.content.ComponentCallbacks2.TRIM_MEMORY_BACKGROUND;

library/src/main/java/com/bumptech/glide/load/engine/cache/MemoryCache.java

@@ -2,7 +2,7 @@ package com.bumptech.glide.load.engine.cache;
 
 import android.content.ComponentCallbacks2;
 import com.bumptech.glide.load.Key;
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 
 /**
  * An interface for adding and removing resources from an in memory cache

library/src/main/java/com/bumptech/glide/load/engine/cache/MemoryCacheAdapter.java

 package com.bumptech.glide.load.engine.cache;
 
 import com.bumptech.glide.load.Key;
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 
 public class MemoryCacheAdapter implements MemoryCache {
 

library/src/main/java/com/bumptech/glide/load/resource/NullCacheDecoder.java

 package com.bumptech.glide.load.resource;
 
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 import com.bumptech.glide.load.ResourceDecoder;
 
 import java.io.IOException;

library/src/main/java/com/bumptech/glide/load/resource/bitmap/BitmapDrawableResource.java

 package com.bumptech.glide.load.resource.bitmap;
 
 import android.graphics.drawable.BitmapDrawable;
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool;
 import com.bumptech.glide.util.Util;
 

library/src/main/java/com/bumptech/glide/load/resource/bitmap/BitmapEncoder.java

 package com.bumptech.glide.load.resource.bitmap;
 
 import android.graphics.Bitmap;
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 import com.bumptech.glide.load.ResourceEncoder;
 
 import java.io.OutputStream;

library/src/main/java/com/bumptech/glide/load/resource/bitmap/BitmapResource.java

 package com.bumptech.glide.load.resource.bitmap;
 
 import android.graphics.Bitmap;
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool;
 import com.bumptech.glide.util.Util;
 

library/src/main/java/com/bumptech/glide/load/resource/bitmap/CenterCrop.java

 package com.bumptech.glide.load.resource.bitmap;
 
 import android.graphics.Bitmap;
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool;
 import com.bumptech.glide.load.Transformation;
 

library/src/main/java/com/bumptech/glide/load/resource/bitmap/FileDescriptorBitmapDecoder.java

@@ -2,7 +2,7 @@ package com.bumptech.glide.load.resource.bitmap;
 
 import android.graphics.Bitmap;
 import android.os.ParcelFileDescriptor;
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 import com.bumptech.glide.load.ResourceDecoder;
 import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool;
 import com.bumptech.glide.load.DecodeFormat;

library/src/main/java/com/bumptech/glide/load/resource/bitmap/FitCenter.java

 package com.bumptech.glide.load.resource.bitmap;
 
 import android.graphics.Bitmap;
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool;
 import com.bumptech.glide.load.Transformation;
 

library/src/main/java/com/bumptech/glide/load/resource/bitmap/ImageVideoBitmapDecoder.java

@@ -3,7 +3,7 @@ package com.bumptech.glide.load.resource.bitmap;
 import android.graphics.Bitmap;
 import android.os.ParcelFileDescriptor;
 import android.util.Log;
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 import com.bumptech.glide.load.ResourceDecoder;
 import com.bumptech.glide.load.model.ImageVideoWrapper;
 

library/src/main/java/com/bumptech/glide/load/resource/bitmap/StreamBitmapDecoder.java

@@ -3,7 +3,7 @@ package com.bumptech.glide.load.resource.bitmap;
 import android.content.Context;
 import android.graphics.Bitmap;
 import com.bumptech.glide.Glide;
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 import com.bumptech.glide.load.DecodeFormat;
 import com.bumptech.glide.load.ResourceDecoder;
 import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool;

library/src/main/java/com/bumptech/glide/load/resource/bytes/BytesResource.java

 package com.bumptech.glide.load.resource.bytes;
 
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 
 public class BytesResource extends Resource<byte[]> {
     private byte[] bytes;

library/src/main/java/com/bumptech/glide/load/resource/gif/GifDataResource.java

 package com.bumptech.glide.load.resource.gif;
 
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 
 public class GifDataResource extends Resource<GifData> {
     private GifData gifData;

library/src/main/java/com/bumptech/glide/load/resource/gif/GifDataTransformation.java

 package com.bumptech.glide.load.resource.gif;
 
 import android.graphics.Bitmap;
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 import com.bumptech.glide.load.MultiTransformation;
 import com.bumptech.glide.load.Transformation;
 

library/src/main/java/com/bumptech/glide/load/resource/gif/GifDrawableResource.java

 package com.bumptech.glide.load.resource.gif;
 
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 
 public class GifDrawableResource extends Resource<GifDrawable> {
     private Resource<GifData> wrapped;

library/src/main/java/com/bumptech/glide/load/resource/gif/GifFrameResourceDecoder.java

 package com.bumptech.glide.load.resource.gif;
 
 import android.graphics.Bitmap;
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 import com.bumptech.glide.gifdecoder.GifDecoder;
 import com.bumptech.glide.load.ResourceDecoder;
 import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool;

library/src/main/java/com/bumptech/glide/load/resource/gif/GifResourceEncoder.java

 package com.bumptech.glide.load.resource.gif;
 
 import android.util.Log;
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 import com.bumptech.glide.load.ResourceEncoder;
 
 import java.io.IOException;

library/src/main/java/com/bumptech/glide/load/resource/gifbitmap/GifBitmapWrapper.java

 package com.bumptech.glide.load.resource.gifbitmap;
 
 import android.graphics.Bitmap;
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 import com.bumptech.glide.load.resource.gif.GifData;
 
 public class GifBitmapWrapper {

library/src/main/java/com/bumptech/glide/load/resource/gifbitmap/GifBitmapWrapperResource.java

 package com.bumptech.glide.load.resource.gifbitmap;
 
 import android.graphics.Bitmap;
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 import com.bumptech.glide.load.resource.gif.GifData;
 
 public class GifBitmapWrapperResource extends Resource<GifBitmapWrapper> {

library/src/main/java/com/bumptech/glide/load/resource/gifbitmap/GifBitmapWrapperResourceDecoder.java

 package com.bumptech.glide.load.resource.gifbitmap;
 
 import android.graphics.Bitmap;
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 import com.bumptech.glide.load.ResourceDecoder;
 import com.bumptech.glide.load.model.ImageVideoWrapper;
 import com.bumptech.glide.load.resource.bitmap.ImageHeaderParser;

library/src/main/java/com/bumptech/glide/load/resource/gifbitmap/GifBitmapWrapperResourceEncoder.java

 package com.bumptech.glide.load.resource.gifbitmap;
 
 import android.graphics.Bitmap;
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 import com.bumptech.glide.load.ResourceEncoder;
 import com.bumptech.glide.load.resource.gif.GifData;
 

library/src/main/java/com/bumptech/glide/load/resource/gifbitmap/GifBitmapWrapperStreamResourceDecoder.java

 package com.bumptech.glide.load.resource.gifbitmap;
 
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 import com.bumptech.glide.load.ResourceDecoder;
 import com.bumptech.glide.load.model.ImageVideoWrapper;
 

library/src/main/java/com/bumptech/glide/load/resource/gifbitmap/GifBitmapWrapperTransformation.java

 package com.bumptech.glide.load.resource.gifbitmap;
 
 import android.graphics.Bitmap;
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 import com.bumptech.glide.load.Transformation;
 import com.bumptech.glide.load.resource.gif.GifData;
 import com.bumptech.glide.load.resource.gif.GifDataTransformation;

library/src/main/java/com/bumptech/glide/load/resource/transcode/BitmapBytesTranscoder.java

 package com.bumptech.glide.load.resource.transcode;
 
 import android.graphics.Bitmap;
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 import com.bumptech.glide.load.resource.bytes.BytesResource;
 
 import java.io.ByteArrayOutputStream;

library/src/main/java/com/bumptech/glide/load/resource/transcode/BitmapDrawableTranscoder.java

@@ -3,7 +3,7 @@ package com.bumptech.glide.load.resource.transcode;
 import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.graphics.drawable.BitmapDrawable;
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 import com.bumptech.glide.load.resource.bitmap.BitmapDrawableResource;
 import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool;
 

library/src/main/java/com/bumptech/glide/load/resource/transcode/GifBitmapWrapperDrawableTranscoder.java

@@ -2,7 +2,7 @@ package com.bumptech.glide.load.resource.transcode;
 
 import android.graphics.Bitmap;
 import android.graphics.drawable.Drawable;
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 import com.bumptech.glide.load.resource.gif.GifData;
 import com.bumptech.glide.load.resource.gifbitmap.GifBitmapWrapper;
 

library/src/main/java/com/bumptech/glide/load/resource/transcode/GifDataBytesTranscoder.java

 package com.bumptech.glide.load.resource.transcode;
 
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 import com.bumptech.glide.load.resource.bytes.BytesResource;
 import com.bumptech.glide.load.resource.gif.GifData;
 

library/src/main/java/com/bumptech/glide/load/resource/transcode/GifDataDrawableTranscoder.java

 package com.bumptech.glide.load.resource.transcode;
 
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 import com.bumptech.glide.load.resource.gif.GifData;
 import com.bumptech.glide.load.resource.gif.GifDrawable;
 import com.bumptech.glide.load.resource.gif.GifDrawableResource;

library/src/main/java/com/bumptech/glide/load/resource/transcode/ResourceTranscoder.java

 package com.bumptech.glide.load.resource.transcode;
 
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 
 /**
  * Transcodes a resource of one type to a resource of another type.

library/src/main/java/com/bumptech/glide/load/resource/transcode/UnitTranscoder.java

 package com.bumptech.glide.load.resource.transcode;
 
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 
 public class UnitTranscoder implements ResourceTranscoder {
     private static final UnitTranscoder UNIT_TRANSCODER = new UnitTranscoder();

library/src/main/java/com/bumptech/glide/request/GenericRequest.java

@@ -4,7 +4,7 @@ import android.content.Context;
 import android.graphics.drawable.Drawable;
 import android.util.Log;
 import com.bumptech.glide.Priority;
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 import com.bumptech.glide.load.ResourceDecoder;
 import com.bumptech.glide.load.ResourceEncoder;
 import com.bumptech.glide.load.Transformation;

library/src/main/java/com/bumptech/glide/request/ResourceCallback.java

 package com.bumptech.glide.request;
 
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 
 public interface ResourceCallback {
 

library/src/test/java/com/bumptech/glide/GlideTest.java

@@ -20,6 +20,7 @@ import com.android.volley.toolbox.NoCache;
 import com.bumptech.glide.load.ResourceDecoder;
 import com.bumptech.glide.load.ResourceEncoder;
 import com.bumptech.glide.load.data.DataFetcher;
+import com.bumptech.glide.load.engine.Resource;
 import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool;
 import com.bumptech.glide.load.engine.cache.DiskCache;
 import com.bumptech.glide.load.engine.cache.MemoryCache;

library/src/test/java/com/bumptech/glide/load/MultiTransformationTest.java

 package com.bumptech.glide.load;
 
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 import org.junit.Test;
 
 import java.util.ArrayList;

library/src/test/java/com/bumptech/glide/load/SkipCacheTest.java

 package com.bumptech.glide.load;
 
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 import org.junit.Test;
 
 import java.io.ByteArrayOutputStream;

library/src/test/java/com/bumptech/glide/load/engine/EngineJobTest.java

 package com.bumptech.glide.load.engine;
 
 import android.os.Handler;
-import com.bumptech.glide.Resource;
 import com.bumptech.glide.load.Key;
 import com.bumptech.glide.load.engine.cache.MemoryCache;
 import com.bumptech.glide.request.ResourceCallback;

library/src/test/java/com/bumptech/glide/load/engine/EngineTest.java

 package com.bumptech.glide.load.engine;
 
 import com.bumptech.glide.Priority;
-import com.bumptech.glide.Resource;
 import com.bumptech.glide.load.Key;
 import com.bumptech.glide.load.ResourceDecoder;
 import com.bumptech.glide.load.ResourceEncoder;

library/src/test/java/com/bumptech/glide/load/engine/ResourceRunnerTest.java

 package com.bumptech.glide.load.engine;
 
 import com.bumptech.glide.Priority;
-import com.bumptech.glide.Resource;
 import com.bumptech.glide.load.Key;
 import com.bumptech.glide.load.ResourceDecoder;
 import com.bumptech.glide.load.Transformation;

library/src/test/java/com/bumptech/glide/ResourceTest.java → library/src/test/java/com/bumptech/glide/load/engine/ResourceTest.java

-package com.bumptech.glide;
+package com.bumptech.glide.load.engine;
 
 import com.bumptech.glide.load.Key;
 import junit.framework.Assert;
@@ -8,6 +8,8 @@ import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
@@ -119,6 +121,14 @@ public class ResourceTest {
         resource.release();
     }
 
+    @Test
+    public void testCanSetAndGetIsCacheable() {
+        resource.setCacheable(true);
+        assertTrue(resource.isCacheable());
+        resource.setCacheable(false);
+        assertFalse(resource.isCacheable());
+    }
+
     private static class MockResource extends Resource<Object> {
         int recycled = 0;
         @Override

library/src/test/java/com/bumptech/glide/load/engine/SourceResourceRunnerTest.java

 package com.bumptech.glide.load.engine;
 
 import com.bumptech.glide.Priority;
-import com.bumptech.glide.Resource;
 import com.bumptech.glide.load.Key;
 import com.bumptech.glide.load.ResourceDecoder;
 import com.bumptech.glide.load.ResourceEncoder;

library/src/test/java/com/bumptech/glide/load/engine/cache/LruResourceCacheTest.java

@@ -2,7 +2,7 @@ package com.bumptech.glide.load.engine.cache;
 
 import android.content.ComponentCallbacks2;
 import com.bumptech.glide.load.Key;
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 import org.junit.Test;
 
 import java.io.UnsupportedEncodingException;

library/src/test/java/com/bumptech/glide/load/resource/bitmap/BitmapEncoderTest.java

 package com.bumptech.glide.load.resource.bitmap;
 
 import android.graphics.Bitmap;
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 import com.bumptech.glide.tests.Util;
 import org.junit.Before;
 import org.junit.Test;

library/src/test/java/com/bumptech/glide/load/resource/bitmap/CenterCropTest.java

 package com.bumptech.glide.load.resource.bitmap;
 
 import android.graphics.Bitmap;
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool;
 import com.bumptech.glide.tests.Util;
 import org.junit.Before;

library/src/test/java/com/bumptech/glide/load/resource/bitmap/FitCenterTest.java

 package com.bumptech.glide.load.resource.bitmap;
 
 import android.graphics.Bitmap;
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool;
 import com.bumptech.glide.tests.Util;
 import org.junit.Before;

library/src/test/java/com/bumptech/glide/load/resource/bitmap/ImageVideoBitmapDecoderTest.java

@@ -2,7 +2,7 @@ package com.bumptech.glide.load.resource.bitmap;
 
 import android.graphics.Bitmap;
 import android.os.ParcelFileDescriptor;
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 import com.bumptech.glide.load.ResourceDecoder;
 import com.bumptech.glide.load.model.ImageVideoWrapper;
 import com.bumptech.glide.tests.Util;

library/src/test/java/com/bumptech/glide/load/resource/bitmap/StreamBitmapDecoderTest.java

 package com.bumptech.glide.load.resource.bitmap;
 
 import android.graphics.Bitmap;
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 import com.bumptech.glide.load.DecodeFormat;
 import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool;
 import com.bumptech.glide.tests.Util;

library/src/test/java/com/bumptech/glide/load/resource/gif/GifDataTransformationTest.java

 package com.bumptech.glide.load.resource.gif;
 
 import android.graphics.Bitmap;
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 import com.bumptech.glide.load.Transformation;
 import org.junit.Before;
 import org.junit.Test;

library/src/test/java/com/bumptech/glide/load/resource/gif/GifDrawableResourceTest.java

 package com.bumptech.glide.load.resource.gif;
 
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;

library/src/test/java/com/bumptech/glide/load/resource/gif/GifResourceEncoderTest.java

 package com.bumptech.glide.load.resource.gif;
 
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 import com.bumptech.glide.tests.Util;
 import org.junit.Before;
 import org.junit.Test;

library/src/test/java/com/bumptech/glide/load/resource/gifbitmap/GifBitmapResourceDecoderTest.java

@@ -2,7 +2,7 @@ package com.bumptech.glide.load.resource.gifbitmap;
 
 import android.graphics.Bitmap;
 import android.os.ParcelFileDescriptor;
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 import com.bumptech.glide.load.ResourceDecoder;
 import com.bumptech.glide.load.model.ImageVideoWrapper;
 import com.bumptech.glide.load.resource.gif.GifData;

library/src/test/java/com/bumptech/glide/load/resource/gifbitmap/GifBitmapResourceEncoderTest.java

 package com.bumptech.glide.load.resource.gifbitmap;
 
 import android.graphics.Bitmap;
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 import com.bumptech.glide.load.ResourceEncoder;
 import com.bumptech.glide.load.resource.gif.GifData;
 import org.junit.Before;

library/src/test/java/com/bumptech/glide/load/resource/gifbitmap/GifBitmapStreamResourceDecoderTest.java

 package com.bumptech.glide.load.resource.gifbitmap;
 
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 import com.bumptech.glide.load.ResourceDecoder;
 import com.bumptech.glide.load.model.ImageVideoWrapper;
-import com.bumptech.glide.load.resource.gifbitmap.GifBitmapWrapper;
-import com.bumptech.glide.load.resource.gifbitmap.GifBitmapWrapperStreamResourceDecoder;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.invocation.InvocationOnMock;

library/src/test/java/com/bumptech/glide/load/resource/gifbitmap/GifBitmapWrapperResourceTest.java

 package com.bumptech.glide.load.resource.gifbitmap;
 
 import android.graphics.Bitmap;
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 import com.bumptech.glide.load.resource.gif.GifData;
 import org.junit.Before;
 import org.junit.Test;

library/src/test/java/com/bumptech/glide/load/resource/gifbitmap/GifBitmapWrapperTest.java

 package com.bumptech.glide.load.resource.gifbitmap;
 
 import android.graphics.Bitmap;
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 import com.bumptech.glide.load.resource.gif.GifData;
 import org.junit.Test;
 

library/src/test/java/com/bumptech/glide/load/resource/gifbitmap/GifBitmapWrapperTransformationTest.java

 package com.bumptech.glide.load.resource.gifbitmap;
 
 import android.graphics.Bitmap;
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 import com.bumptech.glide.load.Transformation;
 import com.bumptech.glide.load.resource.gif.GifData;
 import org.junit.Before;

library/src/test/java/com/bumptech/glide/load/resource/transcode/BitmapBytesTranscoderTest.java

 package com.bumptech.glide.load.resource.transcode;
 
 import android.graphics.Bitmap;
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 import com.bumptech.glide.tests.Util;
 import org.junit.Before;
 import org.junit.Test;

library/src/test/java/com/bumptech/glide/load/resource/transcode/BitmapDrawableTranscoderTest.java

@@ -2,7 +2,7 @@ package com.bumptech.glide.load.resource.transcode;
 
 import android.graphics.Bitmap;
 import android.graphics.drawable.BitmapDrawable;
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool;
 import com.bumptech.glide.tests.Util;
 import org.junit.Test;

library/src/test/java/com/bumptech/glide/load/resource/transcode/GifBitmapWrapperDrawableTranscoderTest.java

@@ -2,7 +2,7 @@ package com.bumptech.glide.load.resource.transcode;
 
 import android.graphics.Bitmap;
 import android.graphics.drawable.Drawable;
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 import com.bumptech.glide.load.resource.gif.GifData;
 import com.bumptech.glide.load.resource.gifbitmap.GifBitmapWrapper;
 import com.bumptech.glide.tests.Util;

library/src/test/java/com/bumptech/glide/load/resource/transcode/GifDataBytesTranscoderTest.java

 package com.bumptech.glide.load.resource.transcode;
 
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 import com.bumptech.glide.load.resource.gif.GifData;
 import com.bumptech.glide.tests.Util;
 import org.junit.Before;

library/src/test/java/com/bumptech/glide/load/resource/transcode/GifDataDrawableTranscoderTest.java

 package com.bumptech.glide.load.resource.transcode;
 
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 import com.bumptech.glide.load.resource.gif.GifData;
 import com.bumptech.glide.load.resource.gif.GifDrawable;
 import com.bumptech.glide.tests.Util;

library/src/test/java/com/bumptech/glide/load/resource/transcode/UnitTranscoderTest.java

 package com.bumptech.glide.load.resource.transcode;
 
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 import com.bumptech.glide.tests.Util;
 import org.junit.Test;
 

library/src/test/java/com/bumptech/glide/request/GenericRequestTest.java

@@ -6,7 +6,7 @@ import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import com.bumptech.glide.Priority;
-import com.bumptech.glide.Resource;
+import com.bumptech.glide.load.engine.Resource;
 import com.bumptech.glide.load.ResourceDecoder;
 import com.bumptech.glide.load.ResourceEncoder;
 import com.bumptech.glide.load.Transformation;