Merge pull request #1835 from TWiStErRob/streamloaders

Use StreamModelLoader where possible
bumptech · Apr 2, 2017 · 6d83cf1 · 6d83cf1
2 parents b0c9f6e + f909a10
commit 6d83cf1
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 5 deletions.
diff --git a/integration/okhttp/src/main/java/com/bumptech/glide/integration/okhttp/OkHttpUrlLoader.java b/integration/okhttp/src/main/java/com/bumptech/glide/integration/okhttp/OkHttpUrlLoader.java
@@ -7,14 +7,15 @@
 import com.bumptech.glide.load.model.GlideUrl;
 import com.bumptech.glide.load.model.ModelLoader;
 import com.bumptech.glide.load.model.ModelLoaderFactory;
+import com.bumptech.glide.load.model.stream.StreamModelLoader;
 import com.squareup.okhttp.OkHttpClient;
 
 import java.io.InputStream;
 
 /**
  * A simple model loader for fetching media over http/https using OkHttp.
  */
-public class OkHttpUrlLoader implements ModelLoader<GlideUrl, InputStream> {
+public class OkHttpUrlLoader implements StreamModelLoader<GlideUrl> {
 
     /**
      * The default factory for {@link OkHttpUrlLoader}s.

diff --git a/...gration/okhttp3/src/main/java/com/bumptech/glide/integration/okhttp3/OkHttpUrlLoader.java b/...gration/okhttp3/src/main/java/com/bumptech/glide/integration/okhttp3/OkHttpUrlLoader.java
@@ -7,6 +7,7 @@
 import com.bumptech.glide.load.model.GlideUrl;
 import com.bumptech.glide.load.model.ModelLoader;
 import com.bumptech.glide.load.model.ModelLoaderFactory;
+import com.bumptech.glide.load.model.stream.StreamModelLoader;
 import okhttp3.Call;
 import okhttp3.OkHttpClient;
 
@@ -15,7 +16,7 @@
 /**
  * A simple model loader for fetching media over http/https using OkHttp.
  */
-public class OkHttpUrlLoader implements ModelLoader<GlideUrl, InputStream> {
+public class OkHttpUrlLoader implements StreamModelLoader<GlideUrl> {
 
     private final Call.Factory client;
 

diff --git a/integration/volley/src/main/java/com/bumptech/glide/integration/volley/VolleyUrlLoader.java b/integration/volley/src/main/java/com/bumptech/glide/integration/volley/VolleyUrlLoader.java
@@ -9,13 +9,14 @@
 import com.bumptech.glide.load.model.GlideUrl;
 import com.bumptech.glide.load.model.ModelLoader;
 import com.bumptech.glide.load.model.ModelLoaderFactory;
+import com.bumptech.glide.load.model.stream.StreamModelLoader;
 
 import java.io.InputStream;
 
 /**
  *  A simple model loader for fetching media over http/https using Volley.
  */
-public class VolleyUrlLoader implements ModelLoader<GlideUrl, InputStream> {
+public class VolleyUrlLoader implements StreamModelLoader<GlideUrl> {
 
     /**
      * The default factory for {@link VolleyUrlLoader}s.

diff --git a/library/src/main/java/com/bumptech/glide/load/model/stream/HttpUrlGlideUrlLoader.java b/library/src/main/java/com/bumptech/glide/load/model/stream/HttpUrlGlideUrlLoader.java
@@ -16,7 +16,7 @@
  * An {@link com.bumptech.glide.load.model.ModelLoader} for translating {@link com.bumptech.glide.load.model.GlideUrl}
  * (http/https URLS) into {@link java.io.InputStream} data.
  */
-public class HttpUrlGlideUrlLoader implements ModelLoader<GlideUrl, InputStream> {
+public class HttpUrlGlideUrlLoader implements StreamModelLoader<GlideUrl> {
 
     private final ModelCache<GlideUrl, GlideUrl> modelCache;
 

diff --git a/library/src/main/java/com/bumptech/glide/load/model/stream/MediaStoreStreamLoader.java b/library/src/main/java/com/bumptech/glide/load/model/stream/MediaStoreStreamLoader.java
@@ -17,7 +17,7 @@
  * it falls back to the wrapped {@link com.bumptech.glide.load.model.ModelLoader} to load the
  * {@link java.io.InputStream} data.
  */
-public class MediaStoreStreamLoader implements ModelLoader<Uri, InputStream> {
+public class MediaStoreStreamLoader implements StreamModelLoader<Uri> {
     private final Context context;
     private final ModelLoader<Uri, InputStream> uriLoader;