updated examples to 4.3 syntax

adriancole · adriancole · commit f86da0c67c82 · 2013-08-18T11:55:20.000-07:00
diff --git a/example-github/build.gradle b/example-github/build.gradle
@@ -1,8 +1,8 @@
 apply plugin: 'java'
 
 dependencies {
-  compile  'com.netflix.feign:feign-core:4.1.0'
-  compile  'com.netflix.feign:feign-gson:4.1.0'
+  compile  'com.netflix.feign:feign-core:4.3.0'
+  compile  'com.netflix.feign:feign-gson:4.3.0'
   provided 'com.squareup.dagger:dagger-compiler:1.1.0'
 }
 
diff --git a/example-github/src/main/java/feign/example/github/GitHubExample.java b/example-github/src/main/java/feign/example/github/GitHubExample.java
@@ -47,7 +47,7 @@ static class Contributor {
   }
 
   public static void main(String... args) throws InterruptedException {
-    GitHub github = Feign.create(GitHub.class, "https://api.github.com", new GitHubModule());
+    GitHub github = Feign.create(GitHub.class, "https://api.github.com", new GsonModule(), new LogToStderr());
 
     System.out.println("Let's fetch and print a list of the contributors to this library.");
     List<Contributor> contributors = github.contributors("netflix", "feign");
@@ -95,8 +95,8 @@ public ContributorObserver(CountDownLatch latch) {
     }
   }
 
-  @Module(overrides = true, library = true, includes = GsonModule.class)
-  static class GitHubModule {
+  @Module(overrides = true, library = true)
+  static class LogToStderr {
 
     @Provides Logger.Level loggingLevel() {
       return Logger.Level.BASIC;
diff --git a/example-wikipedia/build.gradle b/example-wikipedia/build.gradle
@@ -1,8 +1,8 @@
 apply plugin: 'java'
 
 dependencies {
-  compile  'com.netflix.feign:feign-core:4.1.0'
-  compile  'com.netflix.feign:feign-gson:4.1.0'
+  compile  'com.netflix.feign:feign-core:4.3.0'
+  compile  'com.netflix.feign:feign-gson:4.3.0'
   provided 'com.squareup.dagger:dagger-compiler:1.1.0'
 }
 
diff --git a/example-wikipedia/src/main/java/feign/example/wikipedia/WikipediaExample.java b/example-wikipedia/src/main/java/feign/example/wikipedia/WikipediaExample.java
@@ -30,8 +30,6 @@
 import java.util.Iterator;
 
 import static dagger.Provides.Type.SET;
-import static feign.Logger.ErrorLogger;
-import static feign.Logger.Level.BASIC;
 
 public class WikipediaExample {
 
@@ -56,7 +54,8 @@ public static class Response<X> extends ArrayList<X> {
   }
 
   public static void main(String... args) throws InterruptedException {
-    Wikipedia wikipedia = Feign.create(Wikipedia.class, "http://en.wikipedia.org", new WikipediaModule());
+    Wikipedia wikipedia = Feign.create(Wikipedia.class, "http://en.wikipedia.org",
+        new WikipediaDecoder(), new LogToStderr());
 
     System.out.println("Let's search for PTAL!");
     Iterator<Page> pages = lazySearch(wikipedia, "PTAL");
@@ -102,16 +101,8 @@ public void remove() {
     };
   }
 
-  @Module(overrides = true, library = true, includes = GsonModule.class)
-  static class WikipediaModule {
-
-    @Provides Logger.Level loggingLevel() {
-      return BASIC;
-    }
-
-    @Provides Logger logger() {
-      return new ErrorLogger();
-    }
+  @Module(library = true, includes = GsonModule.class)
+  static class WikipediaDecoder {
 
     /**
      * add to the set of Decoders one that handles {@code Response<Page>}.
@@ -142,4 +133,16 @@ protected Page build(JsonReader reader) throws IOException {
       };
     }
   }
+
+  @Module(overrides = true, library = true)
+  static class LogToStderr {
+
+    @Provides Logger.Level loggingLevel() {
+      return Logger.Level.BASIC;
+    }
+
+    @Provides Logger logger() {
+      return new Logger.ErrorLogger();
+    }
+  }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`apply plugin: 'java'`
`2`	`2`
`3`	`3`	`dependencies {`
`4`		`- compile 'com.netflix.feign:feign-core:4.1.0'`
`5`		`- compile 'com.netflix.feign:feign-gson:4.1.0'`
	`4`	`+ compile 'com.netflix.feign:feign-core:4.3.0'`
	`5`	`+ compile 'com.netflix.feign:feign-gson:4.3.0'`
`6`	`6`	`provided 'com.squareup.dagger:dagger-compiler:1.1.0'`
`7`	`7`	`}`
`8`	`8`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ static class Contributor {`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`public static void main(String... args) throws InterruptedException {`
`50`		`- GitHub github = Feign.create(GitHub.class, "https://api.github.com", new GitHubModule());`
	`50`	`+ GitHub github = Feign.create(GitHub.class, "https://api.github.com", new GsonModule(), new LogToStderr());`
`51`	`51`
`52`	`52`	`System.out.println("Let's fetch and print a list of the contributors to this library.");`
`53`	`53`	`List<Contributor> contributors = github.contributors("netflix", "feign");`
`@@ -95,8 +95,8 @@ public ContributorObserver(CountDownLatch latch) {`
`95`	`95`	`}`
`96`	`96`	`}`
`97`	`97`
`98`		`- @Module(overrides = true, library = true, includes = GsonModule.class)`
`99`		`- static class GitHubModule {`
	`98`	`+ @Module(overrides = true, library = true)`
	`99`	`+ static class LogToStderr {`
`100`	`100`
`101`	`101`	`@Provides Logger.Level loggingLevel() {`
`102`	`102`	`return Logger.Level.BASIC;`