JavaThridProject
diff --git a/‎CHANGES.md‎
Lines changed: 3 additions & 0 deletions b/‎CHANGES.md‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎core/src/main/java/feign/Contract.java‎
Lines changed: 0 additions & 12 deletions b/‎core/src/main/java/feign/Contract.java‎
Lines changed: 0 additions & 12 deletions
diff --git a/‎core/src/main/java/feign/Feign.java‎
Lines changed: 3 additions & 48 deletions b/‎core/src/main/java/feign/Feign.java‎
Lines changed: 3 additions & 48 deletions
@@ -1,3 +1,6 @@
+### Version 5.0
+* Remove support for Observable methods.
+
 ### Version 4.4.1
 * Fix NullPointerException on calling equals and hashCode.
 
 
@@ -18,15 +18,13 @@
 import javax.inject.Named;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
-import java.lang.reflect.Type;
 import java.net.URI;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
 import static feign.Util.checkState;
 import static feign.Util.emptyToNull;
-import static feign.Util.resolveLastTypeParameter;
 
 /**
  * Defines what annotations and values are valid on interfaces.
@@ -58,14 +56,6 @@ public MethodMetadata parseAndValidatateMetadata(Method method) {
       data.returnType(method.getGenericReturnType());
       data.configKey(Feign.configKey(method));
 
-      if (Observable.class.isAssignableFrom(method.getReturnType())) {
-        Type context = method.getGenericReturnType();
-        Type observableType = resolveLastTypeParameter(method.getGenericReturnType(), Observable.class);
-        checkState(observableType != null, "Expected param %s to be Observable<X> or Observable<? super X> or a subtype",
-            context, observableType);
-        data.incrementalType(observableType);
-      }
-
       for (Annotation methodAnnotation : method.getAnnotations()) {
         processAnnotationOnMethod(data, methodAnnotation, method);
       }
@@ -83,8 +73,6 @@ public MethodMetadata parseAndValidatateMetadata(Method method) {
         if (parameterTypes[i] == URI.class) {
           data.urlIndex(i);
         } else if (!isHttpAnnotation) {
-          checkState(!Observer.class.isAssignableFrom(parameterTypes[i]),
-              "Please return Observer as opposed to passing an Observable arg: %s", method);
           checkState(data.formParams().isEmpty(), "Body parameters cannot be used with form parameters.");
           checkState(data.bodyIndex() == null, "Method has too many Body parameters: %s", method);
           data.bodyIndex(i);
 
@@ -16,34 +16,19 @@
 package feign;
 
 
-import dagger.Lazy;
 import dagger.ObjectGraph;
 import dagger.Provides;
 import feign.Logger.NoOpLogger;
 import feign.Request.Options;
 import feign.Target.HardCodedTarget;
-import feign.codec.Decoder;
-import feign.codec.Encoder;
 import feign.codec.ErrorDecoder;
-import feign.codec.IncrementalDecoder;
 
-import javax.inject.Named;
-import javax.inject.Singleton;
 import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.HttpsURLConnection;
 import javax.net.ssl.SSLSocketFactory;
-import java.io.Closeable;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
-import java.util.Set;
-import java.util.concurrent.Executor;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ThreadFactory;
-
-import static java.lang.Thread.MIN_PRIORITY;
 
 /**
  * Feign's purpose is to ease development against http apis that feign
@@ -52,7 +37,7 @@
  * In implementation, Feign is a {@link Feign#newInstance factory} for
  * generating {@link Target targeted} http apis.
  */
-public abstract class Feign implements Closeable {
+public abstract class Feign {
 
   /**
    * Returns a new instance of an HTTP API, defined by annotations in the
@@ -106,9 +91,8 @@ public static class Defaults {
       return SSLSocketFactory.class.cast(SSLSocketFactory.getDefault());
     }
 
-    @Provides
-    HostnameVerifier hostnameVerifier() {
-        return HttpsURLConnection.getDefaultHostnameVerifier();
+    @Provides HostnameVerifier hostnameVerifier() {
+      return HttpsURLConnection.getDefaultHostnameVerifier();
     }
 
     @Provides Client httpClient(Client.Default client) {
@@ -130,22 +114,6 @@ HostnameVerifier hostnameVerifier() {
     @Provides Options options() {
       return new Options();
     }
-
-    /**
-     * Used for both http invocation and decoding when observers are used.
-     */
-    @Provides @Singleton @Named("http") Executor httpExecutor() {
-      return Executors.newCachedThreadPool(new ThreadFactory() {
-        @Override public Thread newThread(final Runnable r) {
-          return new Thread(new Runnable() {
-            @Override public void run() {
-              Thread.currentThread().setPriority(MIN_PRIORITY);
-              r.run();
-            }
-          }, MethodHandler.IDLE_THREAD_NAME);
-        }
-      });
-    }
   }
 
   /**
@@ -188,17 +156,4 @@ private static List<Object> modulesForGraph(Object... modules) {
         modulesForGraph.add(module);
     return modulesForGraph;
   }
-
-  private final Lazy<Executor> httpExecutor;
-
-  Feign(Lazy<Executor> httpExecutor) {
-    this.httpExecutor = httpExecutor;
-  }
-
-  @Override public void close() {
-    Executor e = httpExecutor.get();
-    if (e instanceof ExecutorService) {
-      ExecutorService.class.cast(e).shutdownNow();
-    }
-  }
 }