Remove overrides = true on codec modules

adriancole · adriancole · commit 073e54ee39f0 · 2013-08-18T11:18:39.000-07:00
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,5 +1,6 @@
 ### Version 4.3
 * Add ability to configure zero or more RequestInterceptors.
+* Remove `overrides = true` on codec modules.
 
 ### Version 4.2/3.3
 * Document and enforce JAX-RS annotation processing from server POV
diff --git a/README.md b/README.md
@@ -137,7 +137,7 @@ The `GsonModule` in the `feign-gson` extension configures a (`Decoder.TextStream
 
 Here's how you could write this yourself, using whatever library you prefer:
 ```java
-@Module(overrides = true, library = true)
+@Module(library = true)
 static class JsonModule {
   @Provides(type = SET) Decoder decoder(final JsonParser parser) {
     return new Decoder.TextStream<Object>() {
@@ -215,7 +215,7 @@ If you have to only grab a single field from a server response, you may find reg
 
 Here's how our IAM example grabs only one xml element from a response. 
 ```java
-@Module(overrides = true, library = true)
+@Module(library = true)
 static class IAMModule {
   @Provides(type = SET) Decoder arnDecoder() {
     return Decoders.firstGroup("<Arn>([\\S&&[^<]]+)</Arn>");
diff --git a/core/src/main/java/feign/Feign.java b/core/src/main/java/feign/Feign.java
@@ -124,18 +124,6 @@ public static class Defaults {
       return new Options();
     }
 
-    @Provides Set<Encoder> noEncoders() {
-      return Collections.emptySet();
-    }
-
-    @Provides Set<Decoder> noDecoders() {
-      return Collections.emptySet();
-    }
-
-    @Provides Set<IncrementalDecoder> noIncrementalDecoders() {
-      return Collections.emptySet();
-    }
-
     /**
      * Used for both http invocation and decoding when observers are used.
      */
diff --git a/core/src/main/java/feign/ReflectiveFeign.java b/core/src/main/java/feign/ReflectiveFeign.java
@@ -33,9 +33,9 @@
 import java.lang.reflect.Proxy;
 import java.lang.reflect.Type;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -109,7 +109,19 @@ static class FeignInvocationHandler implements InvocationHandler {
   @dagger.Module(complete = false, injects = {Feign.class, MethodHandler.Factory.class}, library = true)
   public static class Module {
     @Provides(type = Provides.Type.SET_VALUES) Set<RequestInterceptor> noRequestInterceptors() {
-      return new LinkedHashSet<RequestInterceptor>();
+      return Collections.emptySet();
+    }
+
+    @Provides(type = Provides.Type.SET_VALUES) Set<Encoder> noEncoders() {
+      return Collections.emptySet();
+    }
+
+    @Provides(type = Provides.Type.SET_VALUES) Set<Decoder> noDecoders() {
+      return Collections.emptySet();
+    }
+
+    @Provides(type = Provides.Type.SET_VALUES) Set<IncrementalDecoder> noIncrementalDecoders() {
+      return Collections.emptySet();
     }
 
     @Provides Feign provideFeign(ReflectiveFeign in) {
diff --git a/core/src/test/java/feign/FeignTest.java b/core/src/test/java/feign/FeignTest.java
@@ -90,7 +90,7 @@ void login(
 
     @RequestLine("POST /") Observable<Response> observableResponse();
 
-    @dagger.Module(overrides = true, library = true)
+    @dagger.Module(library = true)
     static class Module {
       @Provides(type = SET) Encoder defaultEncoder() {
         return new Encoder.Text<Object>() {
@@ -108,14 +108,6 @@ static class Module {
         };
       }
 
-      // just run synchronously
-      @Provides @Singleton @Named("http") Executor httpExecutor() {
-        return new Executor() {
-          @Override public void execute(Runnable command) {
-            command.run();
-          }
-        };
-      }
     }
   }
 
@@ -126,7 +118,8 @@ public void observableVoid() throws IOException, InterruptedException {
     server.play();
 
     try {
-      TestInterface api = Feign.create(TestInterface.class, "http://localhost:" + server.getPort(), new TestInterface.Module());
+      TestInterface api = Feign.create(TestInterface.class, "http://localhost:" + server.getPort(),
+          new TestInterface.Module(), new RunSynchronous());
 
       final AtomicBoolean success = new AtomicBoolean();
 
@@ -160,7 +153,8 @@ public void observableResponse() throws IOException, InterruptedException {
     server.play();
 
     try {
-      TestInterface api = Feign.create(TestInterface.class, "http://localhost:" + server.getPort(), new TestInterface.Module());
+      TestInterface api = Feign.create(TestInterface.class, "http://localhost:" + server.getPort(),
+          new TestInterface.Module(), new RunSynchronous());
 
       final AtomicBoolean success = new AtomicBoolean();
 
@@ -187,14 +181,26 @@ public void observableResponse() throws IOException, InterruptedException {
     }
   }
 
+  @Module(library = true, overrides = true)
+  static class RunSynchronous {
+    @Provides @Singleton @Named("http") Executor httpExecutor() {
+      return new Executor() {
+        @Override public void execute(Runnable command) {
+          command.run();
+        }
+      };
+    }
+  }
+
   @Test
   public void incrementString() throws IOException, InterruptedException {
     final MockWebServer server = new MockWebServer();
     server.enqueue(new MockResponse().setResponseCode(200).setBody("foo"));
     server.play();
 
     try {
-      TestInterface api = Feign.create(TestInterface.class, "http://localhost:" + server.getPort(), new TestInterface.Module());
+      TestInterface api = Feign.create(TestInterface.class, "http://localhost:" + server.getPort(),
+          new TestInterface.Module(), new RunSynchronous());
 
       final AtomicBoolean success = new AtomicBoolean();
 
diff --git a/core/src/test/java/feign/examples/GitHubExample.java b/core/src/test/java/feign/examples/GitHubExample.java
@@ -97,7 +97,7 @@ static class GitHubModule {
   /**
    * Here's how it looks to wire json codecs.  Note, that you can always instead use {@code feign-gson}!
    */
-  @Module(overrides = true, library = true)
+  @Module(library = true)
   static class GsonModule {
 
     @Provides @Singleton Gson gson() {
diff --git a/core/src/test/java/feign/examples/IAMExample.java b/core/src/test/java/feign/examples/IAMExample.java
@@ -63,7 +63,7 @@ private IAMTarget(String accessKey, String secretKey) {
     }
   }
 
-  @Module(overrides = true, library = true)
+  @Module(library = true)
   static class IAMModule {
     @Provides(type = SET) Decoder decoder() {
       return Decoders.firstGroup("<Arn>([\\S&&[^<]]+)</Arn>");
diff --git a/gson/src/main/java/feign/gson/GsonModule.java b/gson/src/main/java/feign/gson/GsonModule.java
@@ -43,7 +43,7 @@
 
 import static dagger.Provides.Type.SET;
 
-@dagger.Module(library = true, overrides = true)
+@dagger.Module(library = true)
 public final class GsonModule {
 
   @Provides(type = SET) Encoder encoder(GsonCodec codec) {

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ private IAMTarget(String accessKey, String secretKey) {`
`63`	`63`	`}`
`64`	`64`	`}`
`65`	`65`
`66`		`- @Module(overrides = true, library = true)`
	`66`	`+ @Module(library = true)`
`67`	`67`	`static class IAMModule {`
`68`	`68`	`@Provides(type = SET) Decoder decoder() {`
`69`	`69`	`return Decoders.firstGroup("<Arn>([\\S&&[^<]]+)</Arn>");`