upgrade ServiceBuilder to check apiKey preconditions compile-tim (not run-time)

kullfar · kullfar · commit d242f45cb1f1 · 2017-06-02T15:58:36.000+03:00
diff --git a/changelog b/changelog
@@ -1,5 +1,6 @@
 [SNAPSHOT]
  * LinkedIn use Header to sign OAuth2 requests
+ * upgrade ServiceBuilder to check apiKey preconditions compile-tim (not run-time)
 
 [4.1.1]
  * omit the client_secret parameter if it is an empty string while refreshing token (thanks to https://github.com/KungfuPancake)
diff --git a/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/AWeberExample.java b/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/AWeberExample.java
@@ -24,8 +24,7 @@ private AWeberExample() {
     }
 
     public static void main(String... args) throws IOException, InterruptedException, ExecutionException {
-        final OAuth10aService service = new ServiceBuilder()
-                .apiKey(CONSUMER_KEY)
+        final OAuth10aService service = new ServiceBuilder(CONSUMER_KEY)
                 .apiSecret(CONSUMER_SECRET)
                 .build(AWeberApi.instance());
 
diff --git a/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/Box20Example.java b/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/Box20Example.java
@@ -27,8 +27,7 @@ public static void main(String... args) throws IOException, InterruptedException
         final String clientId = "your client id";
         final String clientSecret = "your client secret";
         final String secretState = "security_token" + new Random().nextInt(999_999);
-        final OAuth20Service service = new ServiceBuilder()
-                .apiKey(clientId)
+        final OAuth20Service service = new ServiceBuilder(clientId)
                 .apiSecret(clientSecret)
                 .state(secretState)
                 .callback("https://example.com/callback")
diff --git a/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/DiggExample.java b/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/DiggExample.java
@@ -24,8 +24,7 @@ public static void main(String... args) throws IOException, InterruptedException
         // Replace these with your own api key and secret
         final String apiKey = "myKey";
         final String apiSecret = "mySecret";
-        final OAuth10aService service = new ServiceBuilder()
-                .apiKey(apiKey)
+        final OAuth10aService service = new ServiceBuilder(apiKey)
                 .apiSecret(apiSecret)
                 .build(DiggApi.instance());
         final Scanner in = new Scanner(System.in);
diff --git a/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/FacebookAsyncNingExample.java b/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/FacebookAsyncNingExample.java
@@ -35,8 +35,7 @@ public static void main(String... args) throws InterruptedException, ExecutionEx
                 .setReadTimeout(1_000)
                 .build());
 
-        try (OAuth20Service service = new ServiceBuilder()
-                .apiKey(clientId)
+        try (OAuth20Service service = new ServiceBuilder(clientId)
                 .apiSecret(clientSecret)
                 .state(secretState)
                 .callback("http://www.example.com/oauth_callback/")
diff --git a/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/FacebookExample.java b/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/FacebookExample.java
@@ -25,8 +25,7 @@ public static void main(String... args) throws IOException, InterruptedException
         final String clientId = "your client id";
         final String clientSecret = "your client secret";
         final String secretState = "secret" + new Random().nextInt(999_999);
-        final OAuth20Service service = new ServiceBuilder()
-                .apiKey(clientId)
+        final OAuth20Service service = new ServiceBuilder(clientId)
                 .apiSecret(clientSecret)
                 .state(secretState)
                 .callback("http://www.example.com/oauth_callback/")
diff --git a/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/FlickrExample.java b/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/FlickrExample.java
@@ -25,8 +25,7 @@ public static void main(String... args) throws IOException, InterruptedException
         final String apiKey = "your_app_id";
         final String apiSecret = "your_api_secret";
 
-        final OAuth10aService service = new ServiceBuilder()
-                .apiKey(apiKey)
+        final OAuth10aService service = new ServiceBuilder(apiKey)
                 .apiSecret(apiSecret)
                 .build(FlickrApi.instance(FlickrApi.FlickrPerm.DELETE));
         final Scanner in = new Scanner(System.in);
diff --git a/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/Foursquare2Example.java b/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/Foursquare2Example.java
@@ -23,8 +23,7 @@ public static void main(String... args) throws IOException, InterruptedException
         // Replace these with your own api key and secret
         final String apiKey = "your client id";
         final String apiSecret = "your client secret";
-        final OAuth20Service service = new ServiceBuilder()
-                .apiKey(apiKey)
+        final OAuth20Service service = new ServiceBuilder(apiKey)
                 .apiSecret(apiSecret)
                 .callback("http://localhost:9000/")
                 .build(Foursquare2Api.instance());
diff --git a/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/FoursquareExample.java b/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/FoursquareExample.java
@@ -20,8 +20,7 @@ private FoursquareExample() {
     }
 
     public static void main(String... args) throws IOException, InterruptedException, ExecutionException {
-        final OAuth10aService service = new ServiceBuilder()
-                .apiKey("your client id")
+        final OAuth10aService service = new ServiceBuilder("your client id")
                 .apiSecret("your client secret")
                 .build(FoursquareApi.instance());
         final Scanner in = new Scanner(System.in);
diff --git a/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/FreelancerExample.java b/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/FreelancerExample.java
@@ -24,8 +24,7 @@ private FreelancerExample() {
     }
 
     public static void main(String... args) throws IOException, InterruptedException, ExecutionException {
-        final OAuth10aService service = new ServiceBuilder()
-                .apiKey("your client id")
+        final OAuth10aService service = new ServiceBuilder("your client id")
                 .apiSecret("your client secret")
                 .scope(SCOPE)
                 .build(FreelancerApi.Sandbox.instance());
diff --git a/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/GeniusExample.java b/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/GeniusExample.java
@@ -25,8 +25,7 @@ public static void main(String... args) throws IOException, InterruptedException
         final String clientId = "your client id";
         final String clientSecret = "your client secret";
         final String secretState = "100";
-        final OAuth20Service service = new ServiceBuilder()
-                .apiKey(clientId)
+        final OAuth20Service service = new ServiceBuilder(clientId)
                 .apiSecret(clientSecret)
                 .scope("me")
                 .state(secretState)
diff --git a/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/GitHubAsyncOkHttpExample.java b/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/GitHubAsyncOkHttpExample.java
@@ -27,8 +27,7 @@ public static void main(String... args) throws IOException, ExecutionException,
         final String clientId = "your client id";
         final String clientSecret = "your client secret";
         final String secretState = "secret" + new Random().nextInt(999_999);
-        try (OAuth20Service service = new ServiceBuilder()
-                .apiKey(clientId)
+        try (OAuth20Service service = new ServiceBuilder(clientId)
                 .apiSecret(clientSecret)
                 .state(secretState)
                 .callback("http://www.example.com/oauth_callback/")
diff --git a/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/GitHubExample.java b/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/GitHubExample.java
@@ -25,8 +25,7 @@ public static void main(String... args) throws IOException, InterruptedException
         final String clientId = "your client id";
         final String clientSecret = "your client secret";
         final String secretState = "secret" + new Random().nextInt(999_999);
-        final OAuth20Service service = new ServiceBuilder()
-                .apiKey(clientId)
+        final OAuth20Service service = new ServiceBuilder(clientId)
                 .apiSecret(clientSecret)
                 .state(secretState)
                 .callback("http://www.example.com/oauth_callback/")
diff --git a/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/Google20AsyncAHCExample.java b/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/Google20AsyncAHCExample.java
@@ -37,8 +37,7 @@ public static void main(String... args) throws InterruptedException, ExecutionEx
                 .setReadTimeout(1_000)
                 .build());
 
-        try (OAuth20Service service = new ServiceBuilder()
-                .apiKey(clientId)
+        try (OAuth20Service service = new ServiceBuilder(clientId)
                 .apiSecret(clientSecret)
                 .scope("profile") // replace with desired scope
                 .state(secretState)
diff --git a/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/Google20Example.java b/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/Google20Example.java
@@ -27,8 +27,7 @@ public static void main(String... args) throws IOException, InterruptedException
         final String clientId = "your client id";
         final String clientSecret = "your client secret";
         final String secretState = "secret" + new Random().nextInt(999_999);
-        final OAuth20Service service = new ServiceBuilder()
-                .apiKey(clientId)
+        final OAuth20Service service = new ServiceBuilder(clientId)
                 .apiSecret(clientSecret)
                 .scope("profile") // replace with desired scope
                 .state(secretState)
diff --git a/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/HHExample.java b/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/HHExample.java
@@ -25,8 +25,7 @@ public static void main(String... args) throws IOException, InterruptedException
         // Replace these with your own client id and secret
         final String clientId = "your client id";
         final String clientSecret = "your client secret";
-        final OAuth20Service service = new ServiceBuilder()
-                .apiKey(clientId)
+        final OAuth20Service service = new ServiceBuilder(clientId)
                 .apiSecret(clientSecret)
                 .callback("http://your.site.com/callback")
                 .build(HHApi.instance());
diff --git a/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/ImgurExample.java b/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/ImgurExample.java
@@ -24,8 +24,7 @@ public static void main(String... args) throws IOException, InterruptedException
         // Replace these with your own api key and secret
         final String apiKey = "your client id";
         final String apiSecret = "your client secret";
-        final OAuth20Service service = new ServiceBuilder()
-                .apiKey(apiKey)
+        final OAuth20Service service = new ServiceBuilder(apiKey)
                 .apiSecret(apiSecret)
                 .build(ImgurApi.instance());
         final Scanner in = new Scanner(System.in);
diff --git a/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/Kaixin20Example.java b/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/Kaixin20Example.java
@@ -23,8 +23,7 @@ public static void main(String... args) throws IOException, InterruptedException
         // Replace these with your own api key and secret
         final String apiKey = "your api key";
         final String apiSecret = "your api secret";
-        final OAuth20Service service = new ServiceBuilder()
-                .apiKey(apiKey)
+        final OAuth20Service service = new ServiceBuilder(apiKey)
                 .apiSecret(apiSecret)
                 .callback("http://your.domain.com/handle")
                 .build(KaixinApi20.instance());
diff --git a/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/LinkedIn20Example.java b/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/LinkedIn20Example.java
@@ -23,8 +23,8 @@ public static void main(String... args) throws IOException, InterruptedException
         // Replace these with your client id and secret
         final String clientId = "your client id";
         final String clientSecret = "your client secret";
-        final OAuth20Service service = new ServiceBuilder()
-                .apiKey(clientId).apiSecret(clientSecret)
+        final OAuth20Service service = new ServiceBuilder(clientId)
+                .apiSecret(clientSecret)
                 .scope("r_basicprofile r_emailaddress") // replace with desired scope
                 .callback("http://example.com/callback")
                 .state("some_params")
diff --git a/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/LinkedInExample.java b/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/LinkedInExample.java
@@ -21,8 +21,7 @@ private LinkedInExample() {
     }
 
     public static void main(String... args) throws IOException, InterruptedException, ExecutionException {
-        final OAuth10aService service = new ServiceBuilder()
-                .apiKey("your client id")
+        final OAuth10aService service = new ServiceBuilder("your client id")
                 .apiSecret("your client secret")
                 .build(LinkedInApi.instance());
         final Scanner in = new Scanner(System.in);
diff --git a/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/LinkedInExampleWithScopes.java b/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/LinkedInExampleWithScopes.java
@@ -25,8 +25,7 @@ public static void main(String... args) throws IOException, InterruptedException
         final String clientId = "your client id";
         final String clientSecret = "your client id";
 
-        final OAuth10aService service = new ServiceBuilder()
-                .apiKey(clientId)
+        final OAuth10aService service = new ServiceBuilder(clientId)
                 .apiSecret(clientSecret)
                 .build(LinkedInApi.instance("foo", "bar", "baz"));
         final Scanner in = new Scanner(System.in);
diff --git a/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/LiveExample.java b/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/LiveExample.java
@@ -23,8 +23,7 @@ public static void main(String... args) throws IOException, InterruptedException
         // Replace these with your own api key and secret
         final String apiKey = "";
         final String apiSecret = "";
-        final OAuth20Service service = new ServiceBuilder()
-                .apiKey(apiKey)
+        final OAuth20Service service = new ServiceBuilder(apiKey)
                 .apiSecret(apiSecret)
                 .scope("wl.basic")
                 .callback("http://localhost:9000/")
diff --git a/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/MailruAsyncExample.java b/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/MailruAsyncExample.java
@@ -35,8 +35,7 @@ public static void main(String... args) throws InterruptedException, ExecutionEx
                 .setReadTimeout(10_000)
                 .build());
 
-        try (OAuth20Service service = new ServiceBuilder()
-                .apiKey(clientId)
+        try (OAuth20Service service = new ServiceBuilder(clientId)
                 .apiSecret(clientSecret)
                 .callback("http://www.example.com/oauth_callback/")
                 .httpClientConfig(clientConfig)
diff --git a/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/MailruExample.java b/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/MailruExample.java
@@ -24,8 +24,7 @@ public static void main(String... args) throws IOException, InterruptedException
         // Replace these with your client id and secret
         final String clientId = "your client id";
         final String clientSecret = "your client secret";
-        final OAuth20Service service = new ServiceBuilder()
-                .apiKey(clientId)
+        final OAuth20Service service = new ServiceBuilder(clientId)
                 .apiSecret(clientSecret)
                 .callback("http://www.example.com/oauth_callback/")
                 .build(MailruApi.instance());
diff --git a/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/MeetupExample.java b/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/MeetupExample.java
@@ -20,8 +20,7 @@ private MeetupExample() {
     }
 
     public static void main(String... args) throws IOException, InterruptedException, ExecutionException {
-        final OAuth10aService service = new ServiceBuilder()
-                .apiKey("your client id")
+        final OAuth10aService service = new ServiceBuilder("your client id")
                 .apiSecret("your client secret")
                 .build(MeetupApi.instance());
         final Scanner in = new Scanner(System.in);
diff --git a/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/MisfitExample.java b/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/MisfitExample.java
@@ -25,8 +25,7 @@ public static void main(String... args) throws IOException, InterruptedException
         // Replace these with your own api key and secret
         final String apiKey = "your client id";
         final String apiSecret = "your client secret";
-        final OAuth20Service service = new ServiceBuilder()
-                .apiKey(apiKey)
+        final OAuth20Service service = new ServiceBuilder(apiKey)
                 .apiSecret(apiSecret)
                 .callback("http://example.com/callback/")
                 .scope("public,birthday,email,tracking,session,sleep")
diff --git a/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/NaverExample.java b/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/NaverExample.java
@@ -26,8 +26,7 @@ public static void main(String... args) throws IOException, InterruptedException
         final String clientId = "your client id";
         final String clientSecret = "your client secret";
         final String secretState = "secret" + new Random().nextInt(999_999);
-        final OAuth20Service service = new ServiceBuilder()
-                .apiKey(clientId)
+        final OAuth20Service service = new ServiceBuilder(clientId)
                 .apiSecret(clientSecret)
                 .state(secretState)
                 .callback("http://www.example.com/oauth_callback/")
diff --git a/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/NeteaseWeiboExample.java b/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/NeteaseWeiboExample.java
@@ -24,8 +24,7 @@ public static void main(String... args) throws IOException, InterruptedException
         // Replace these with your own api key and secret
         final String apiKey = "your key";
         final String apiSecret = "your secret";
-        final OAuth10aService service = new ServiceBuilder()
-                .apiKey(apiKey)
+        final OAuth10aService service = new ServiceBuilder(apiKey)
                 .apiSecret(apiSecret)
                 .build(NeteaseWeibooApi.instance());
         final Scanner in = new Scanner(System.in);
diff --git a/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/OdnoklassnikiExample.java b/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/OdnoklassnikiExample.java
@@ -26,8 +26,7 @@ public static void main(String... args) throws IOException, InterruptedException
         final String publicKey = "your api public key";
         final String secretKey = "your api secret key";
 
-        final OAuth20Service service = new ServiceBuilder()
-                .apiKey(clientId)
+        final OAuth20Service service = new ServiceBuilder(clientId)
                 .apiSecret(secretKey)
                 .callback("http://your.site.com/callback")
                 .build(OdnoklassnikiApi.instance());
diff --git a/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/PinterestExample.java b/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/PinterestExample.java
@@ -23,8 +23,7 @@ public static void main(String... args) throws IOException, InterruptedException
         // Replace these with your own api key and secret
         final String apiKey = "your_app_id";
         final String apiSecret = "your_app_secret";
-        final OAuth20Service service = new ServiceBuilder()
-                .apiKey(apiKey)
+        final OAuth20Service service = new ServiceBuilder(apiKey)
                 .apiSecret(apiSecret)
                 .scope("read_public,write_public,read_relationships,write_relationships")
                 .callback("https://localhost:9000/") // Add as valid callback in developer portal
diff --git a/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/Px500Example.java b/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/Px500Example.java
@@ -20,8 +20,7 @@ private Px500Example() {
     }
 
     public static void main(String... args) throws IOException, InterruptedException, ExecutionException {
-        final OAuth10aService service = new ServiceBuilder()
-                .apiKey("your-api-key")
+        final OAuth10aService service = new ServiceBuilder("your-api-key")
                 .apiSecret("your-api-secret")
                 .build(Px500Api.instance());
         final Scanner in = new Scanner(System.in);
diff --git a/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/RenrenExample.java b/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/RenrenExample.java
@@ -32,8 +32,7 @@ public static void main(String... args) throws IOException, InterruptedException
         // Replace these with your own api key and secret
         final String apiKey = "your api key";
         final String apiSecret = "your api secret";
-        final OAuth20Service service = new ServiceBuilder()
-                .apiKey(apiKey)
+        final OAuth20Service service = new ServiceBuilder(apiKey)
                 .apiSecret(apiSecret)
                 .scope("status_update publish_feed")
                 .callback("http://your.doman.com/oauth/renren")
diff --git a/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/SalesforceExample.java b/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/SalesforceExample.java
@@ -39,8 +39,7 @@ public static void main(String... args) throws IOException, NoSuchAlgorithmExcep
         // When you plan to connect to a Sandbox environment you've to use SalesforceApi.sandbox() API instance
         // new ServiceBuilder.....build(SalesforceApi.sandbox());
 
-        final OAuth20Service service = new ServiceBuilder()
-                .apiKey(clientId)
+        final OAuth20Service service = new ServiceBuilder(clientId)
                 .apiSecret(clientSecret)
                 .callback("https://www.example.com/callback")
                 .build(SalesforceApi.instance());
diff --git a/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/SalesforceNingAsyncExample.java b/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/SalesforceNingAsyncExample.java
@@ -44,8 +44,7 @@ public static void main(String... args) throws InterruptedException, ExecutionEx
 
         //IT's important! Salesforce upper require TLS v1.1 or 1.2
         SalesforceApi.initTLSv11orUpper();
-        try (OAuth20Service service = new ServiceBuilder()
-                .apiKey(clientId)
+        try (OAuth20Service service = new ServiceBuilder(clientId)
                 .apiSecret(clientSecret)
                 .httpClientConfig(clientConfig)
                 .callback("https://www.example.com/callback")
diff --git a/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/SinaWeibo2Example.java b/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/SinaWeibo2Example.java
@@ -23,8 +23,7 @@ public static void main(String... args) throws IOException, InterruptedException
         // Replace these with your own api key and secret
         final String apiKey = "your_api_key";
         final String apiSecret = "your_api_secret";
-        final OAuth20Service service = new ServiceBuilder()
-                .apiKey(apiKey)
+        final OAuth20Service service = new ServiceBuilder(apiKey)
                 .apiSecret(apiSecret)
                 .callback("http://www.dajie.com/oauth/sina")
                 .build(SinaWeiboApi20.instance());
diff --git a/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/SinaWeiboExample.java b/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/SinaWeiboExample.java
@@ -24,8 +24,7 @@ public static void main(String... args) throws IOException, InterruptedException
         // Replace these with your own api key and secret
         final String apiKey = "your key";
         final String apiSecret = "your secret";
-        final OAuth10aService service = new ServiceBuilder()
-                .apiKey(apiKey)
+        final OAuth10aService service = new ServiceBuilder(apiKey)
                 .apiSecret(apiSecret)
                 .build(SinaWeiboApi.instance());
         final Scanner in = new Scanner(System.in);
diff --git a/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/SkyrockExample.java b/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/SkyrockExample.java
@@ -20,8 +20,7 @@ private SkyrockExample() {
     }
 
     public static void main(String... args) throws IOException, InterruptedException, ExecutionException {
-        final OAuth10aService service = new ServiceBuilder()
-                .apiKey("your-api-key")
+        final OAuth10aService service = new ServiceBuilder("your-api-key")
                 .apiSecret("your-api-secret")
                 .build(SkyrockApi.instance());
         final Scanner in = new Scanner(System.in);
diff --git a/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/SohuWeiboExample.java b/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/SohuWeiboExample.java
diff --git a/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/StackExchangeExample.java b/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/StackExchangeExample.java
diff --git a/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/TheThingsNetworkV1StagingExample.java b/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/TheThingsNetworkV1StagingExample.java
diff --git a/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/TheThingsNetworkV2PreviewExample.java b/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/TheThingsNetworkV2PreviewExample.java
diff --git a/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/TrelloExample.java b/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/TrelloExample.java
diff --git a/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/TumblrExample.java b/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/TumblrExample.java
diff --git a/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/TutByExample.java b/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/TutByExample.java
diff --git a/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/TwitterExample.java b/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/TwitterExample.java
diff --git a/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/ViadeoExample.java b/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/ViadeoExample.java
diff --git a/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/VkontakteExample.java b/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/VkontakteExample.java
diff --git a/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/VkontakteExternalHttpExample.java b/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/VkontakteExternalHttpExample.java
diff --git a/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/XingExample.java b/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/XingExample.java
diff --git a/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/YahooExample.java b/scribejava-apis/src/test/java/com/github/scribejava/apis/examples/YahooExample.java
diff --git a/scribejava-apis/src/test/java/com/github/scribejava/apis/service/OdnoklassnikiServiceTest.java b/scribejava-apis/src/test/java/com/github/scribejava/apis/service/OdnoklassnikiServiceTest.java
diff --git a/scribejava-core/src/main/java/com/github/scribejava/core/builder/ServiceBuilder.java b/scribejava-core/src/main/java/com/github/scribejava/core/builder/ServiceBuilder.java
diff --git a/scribejava-core/src/test/java/com/github/scribejava/core/builder/ServiceBuilderTest.java b/scribejava-core/src/test/java/com/github/scribejava/core/builder/ServiceBuilderTest.java
diff --git a/scribejava-core/src/test/java/com/github/scribejava/core/oauth/OAuth20ServiceTest.java b/scribejava-core/src/test/java/com/github/scribejava/core/oauth/OAuth20ServiceTest.java

Original file line number	Diff line number	Diff line change
`@@ -24,8 +24,7 @@ private AWeberExample() {`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`public static void main(String... args) throws IOException, InterruptedException, ExecutionException {`
`27`		`- final OAuth10aService service = new ServiceBuilder()`
`28`		`- .apiKey(CONSUMER_KEY)`
	`27`	`+ final OAuth10aService service = new ServiceBuilder(CONSUMER_KEY)`
`29`	`28`	`.apiSecret(CONSUMER_SECRET)`
`30`	`29`	`.build(AWeberApi.instance());`
`31`	`30`
Original file line number	Diff line number	Diff line change
`@@ -20,8 +20,7 @@ private FoursquareExample() {`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`public static void main(String... args) throws IOException, InterruptedException, ExecutionException {`
`23`		`- final OAuth10aService service = new ServiceBuilder()`
`24`		`- .apiKey("your client id")`
	`23`	`+ final OAuth10aService service = new ServiceBuilder("your client id")`
`25`	`24`	`.apiSecret("your client secret")`
`26`	`25`	`.build(FoursquareApi.instance());`
`27`	`26`	`final Scanner in = new Scanner(System.in);`
Original file line number	Diff line number	Diff line change
`@@ -24,8 +24,7 @@ private FreelancerExample() {`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`public static void main(String... args) throws IOException, InterruptedException, ExecutionException {`
`27`		`- final OAuth10aService service = new ServiceBuilder()`
`28`		`- .apiKey("your client id")`
	`27`	`+ final OAuth10aService service = new ServiceBuilder("your client id")`
`29`	`28`	`.apiSecret("your client secret")`
`30`	`29`	`.scope(SCOPE)`
`31`	`30`	`.build(FreelancerApi.Sandbox.instance());`