From f86da0c67c82ae297f639530e9427bb5a0d4a12b Mon Sep 17 00:00:00 2001
From: adriancole <adrian.f.cole@gmail.com>
Date: Sun, 18 Aug 2013 11:55:20 -0700
Subject: [PATCH] updated examples to 4.3 syntax

---
 example-github/build.gradle                   |  4 +--
 .../feign/example/github/GitHubExample.java   |  6 ++--
 example-wikipedia/build.gradle                |  4 +--
 .../example/wikipedia/WikipediaExample.java   | 29 ++++++++++---------
 4 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/example-github/build.gradle b/example-github/build.gradle
index 3ca897e3..126b8632 100644
--- 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
index 81e9b71f..6f897791 100644
--- 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 @@ public class GitHubExample {
   }
 
   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 class GitHubExample {
     }
   }
 
-  @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
index 6d9a64d0..816eda64 100644
--- 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
index 83151288..90ee6916 100644
--- 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.ArrayList;
 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 class WikipediaExample {
   }
 
   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 class WikipediaExample {
     };
   }
 
-  @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 @@ public class WikipediaExample {
       };
     }
   }
+
+  @Module(overrides = true, library = true)
+  static class LogToStderr {
+
+    @Provides Logger.Level loggingLevel() {
+      return Logger.Level.BASIC;
+    }
+
+    @Provides Logger logger() {
+      return new Logger.ErrorLogger();
+    }
+  }
 }