From f909a10876e4f58cb7e8f04d61ccd099a727aa7e Mon Sep 17 00:00:00 2001
From: Robert Papp <papp.robert.s@gmail.com>
Date: Sun, 2 Apr 2017 19:21:05 +0100
Subject: [PATCH] Change ModelLoader<T, InputStream> to StreamModelLoader<T> to
 fix #1832

---
 .../com/bumptech/glide/integration/okhttp/OkHttpUrlLoader.java | 3 ++-
 .../bumptech/glide/integration/okhttp3/OkHttpUrlLoader.java    | 3 ++-
 .../com/bumptech/glide/integration/volley/VolleyUrlLoader.java | 3 ++-
 .../glide/load/model/stream/HttpUrlGlideUrlLoader.java         | 2 +-
 .../glide/load/model/stream/MediaStoreStreamLoader.java        | 2 +-
 5 files changed, 8 insertions(+), 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
index eb35139b4d..10d358df1c 100644
--- 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,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 com.squareup.okhttp.OkHttpClient;
 
 import java.io.InputStream;
@@ -14,7 +15,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> {
 
     /**
      * The default factory for {@link OkHttpUrlLoader}s.
diff --git a/integration/okhttp3/src/main/java/com/bumptech/glide/integration/okhttp3/OkHttpUrlLoader.java b/integration/okhttp3/src/main/java/com/bumptech/glide/integration/okhttp3/OkHttpUrlLoader.java
index f46dd4fc35..045ae6230b 100644
--- a/integration/okhttp3/src/main/java/com/bumptech/glide/integration/okhttp3/OkHttpUrlLoader.java
+++ b/integration/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
index b1be94abdf..edc9dcb3ef 100644
--- 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
index 3ee3060da0..a02765adad 100644
--- 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
index 980997a6b3..502e5123be 100644
--- 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;