Used OAuthConfig when possible instead of bunch of Strings

fernandezpablo85 · fernandezpablo85 · commit 8eb2062e9521 · 2011-01-07T13:10:43.000-03:00
diff --git a/src/main/java/org/scribe/builder/ServiceBuilder.java b/src/main/java/org/scribe/builder/ServiceBuilder.java
@@ -2,7 +2,6 @@
 
 import org.scribe.builder.api.*;
 import org.scribe.exceptions.*;
-
 import org.scribe.model.*;
 import org.scribe.oauth.*;
 import org.scribe.utils.*;
@@ -119,6 +118,6 @@ public OAuthService build()
     Preconditions.checkNotNull(api, "You must specify a valid api through the provider() method");
     Preconditions.checkEmptyString(apiKey, "You must provide an api key");
     Preconditions.checkEmptyString(apiSecret, "You must provide an api secret");
-    return api.createService(apiKey, apiSecret, callback, scope);
+    return api.createService(new OAuthConfig(apiKey, apiSecret, callback), scope);
   }
 }
diff --git a/src/main/java/org/scribe/builder/api/Api.java b/src/main/java/org/scribe/builder/api/Api.java
@@ -1,5 +1,6 @@
 package org.scribe.builder.api;
 
+import org.scribe.model.*;
 import org.scribe.oauth.*;
 
 /**
@@ -20,5 +21,5 @@ public interface Api
    * 
    * @return fully configured {@link OAuthService}
    */
-  OAuthService createService(String apiKey, String apiSecret, String callback, String scope);
+  OAuthService createService(OAuthConfig config, String scope);
 }
diff --git a/src/main/java/org/scribe/builder/api/DefaultApi10a.java b/src/main/java/org/scribe/builder/api/DefaultApi10a.java
@@ -80,25 +80,15 @@ public Verb getRequestTokenVerb()
    * @param callback OAuth callback (either URL or 'oob')
    * @param scope OAuth scope (optional) 
    */
-  public OAuthService createService(String apiKey, String apiSecret, String callback, String scope)
+  public OAuthService createService(OAuthConfig config, String scope)
   {
-    OAuthService service = createService(apiKey, apiSecret, callback);
+    OAuthService service = createService(config);
     service.addScope(scope);
     return service;
   }
   
-  private OAuthService createService(String apiKey, String apiSecret, String callback)
+  private OAuthService createService(OAuthConfig config)
   {
-    return new OAuth10aServiceImpl(this, createConfig(apiKey, apiSecret, callback));
+    return new OAuth10aServiceImpl(this, config);
   }
-  
-  private OAuthConfig createConfig(String apiKey, String apiSecret, String callback)
-  {
-    OAuthConfig config = new OAuthConfig();
-    config.setApiKey(apiKey);
-    config.setApiSecret(apiSecret);
-    config.setCallback(callback);
-    return config;
-  }
-
 }
diff --git a/src/main/java/org/scribe/model/OAuthConfig.java b/src/main/java/org/scribe/model/OAuthConfig.java
@@ -10,6 +10,18 @@ public class OAuthConfig
   private String apiKey;
   private String apiSecret;
   private String callback;
+  
+  public OAuthConfig(String key, String secret)
+  {
+    this(key,secret,null);
+  }
+  
+  public OAuthConfig(String key, String secret, String callback)
+  {
+    this.apiKey = key;
+    this.apiSecret = secret;
+    this.callback = callback;
+  }
 
   public String getApiKey()
   {
diff --git a/src/test/java/org/scribe/model/OAuthConfigTest.java b/src/test/java/org/scribe/model/OAuthConfigTest.java
@@ -10,17 +10,14 @@ public class OAuthConfigTest
   @Test
   public void shouldReturnDefaultValuesIfNotSet()
   {
-    OAuthConfig config = new OAuthConfig();
+    OAuthConfig config = new OAuthConfig("key", "secret");
     assertEquals(OAuthConstants.OUT_OF_BAND, config.getCallback());
   }
 
   @Test
   public void shouldOverrideDefaultsIfSet()
   {
-    OAuthConfig config = new OAuthConfig();
-    config.setCallback("http://callback");
-    config.setApiKey("key");
-    config.setApiSecret("secret");
+    OAuthConfig config = new OAuthConfig("key", "secret", "http://callback");
     assertEquals("http://callback", config.getCallback());
     assertEquals("key", config.getApiKey());
     assertEquals("secret", config.getApiSecret());

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@`
`2`	`2`
`3`	`3`	`import org.scribe.builder.api.*;`
`4`	`4`	`import org.scribe.exceptions.*;`
`5`		`-`
`6`	`5`	`import org.scribe.model.*;`
`7`	`6`	`import org.scribe.oauth.*;`
`8`	`7`	`import org.scribe.utils.*;`
`@@ -119,6 +118,6 @@ public OAuthService build()`
`119`	`118`	`Preconditions.checkNotNull(api, "You must specify a valid api through the provider() method");`
`120`	`119`	`Preconditions.checkEmptyString(apiKey, "You must provide an api key");`
`121`	`120`	`Preconditions.checkEmptyString(apiSecret, "You must provide an api secret");`
`122`		`- return api.createService(apiKey, apiSecret, callback, scope);`
	`121`	`+ return api.createService(new OAuthConfig(apiKey, apiSecret, callback), scope);`
`123`	`122`	`}`
`124`	`123`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`package org.scribe.builder.api;`
`2`	`2`
	`3`	`+import org.scribe.model.*;`
`3`	`4`	`import org.scribe.oauth.*;`
`4`	`5`
`5`	`6`	`/**`
`@@ -20,5 +21,5 @@ public interface Api`
`20`	`21`	`*`
`21`	`22`	`* @return fully configured {@link OAuthService}`
`22`	`23`	`*/`
`23`		`- OAuthService createService(String apiKey, String apiSecret, String callback, String scope);`
	`24`	`+ OAuthService createService(OAuthConfig config, String scope);`
`24`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -80,25 +80,15 @@ public Verb getRequestTokenVerb()`
`80`	`80`	`* @param callback OAuth callback (either URL or 'oob')`
`81`	`81`	`* @param scope OAuth scope (optional)`
`82`	`82`	`*/`
`83`		`- public OAuthService createService(String apiKey, String apiSecret, String callback, String scope)`
	`83`	`+ public OAuthService createService(OAuthConfig config, String scope)`
`84`	`84`	`{`
`85`		`- OAuthService service = createService(apiKey, apiSecret, callback);`
	`85`	`+ OAuthService service = createService(config);`
`86`	`86`	`service.addScope(scope);`
`87`	`87`	`return service;`
`88`	`88`	`}`
`89`	`89`
`90`		`- private OAuthService createService(String apiKey, String apiSecret, String callback)`
	`90`	`+ private OAuthService createService(OAuthConfig config)`
`91`	`91`	`{`
`92`		`- return new OAuth10aServiceImpl(this, createConfig(apiKey, apiSecret, callback));`
	`92`	`+ return new OAuth10aServiceImpl(this, config);`
`93`	`93`	`}`
`94`		`-`
`95`		`- private OAuthConfig createConfig(String apiKey, String apiSecret, String callback)`
`96`		`- {`
`97`		`- OAuthConfig config = new OAuthConfig();`
`98`		`- config.setApiKey(apiKey);`
`99`		`- config.setApiSecret(apiSecret);`
`100`		`- config.setCallback(callback);`
`101`		`- return config;`
`102`		`- }`
`103`		`-`
`104`	`94`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,17 +10,14 @@ public class OAuthConfigTest`
`10`	`10`	`@Test`
`11`	`11`	`public void shouldReturnDefaultValuesIfNotSet()`
`12`	`12`	`{`
`13`		`- OAuthConfig config = new OAuthConfig();`
	`13`	`+ OAuthConfig config = new OAuthConfig("key", "secret");`
`14`	`14`	`assertEquals(OAuthConstants.OUT_OF_BAND, config.getCallback());`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`@Test`
`18`	`18`	`public void shouldOverrideDefaultsIfSet()`
`19`	`19`	`{`
`20`		`- OAuthConfig config = new OAuthConfig();`
`21`		`- config.setCallback("http://callback");`
`22`		`- config.setApiKey("key");`
`23`		`- config.setApiSecret("secret");`
	`20`	`+ OAuthConfig config = new OAuthConfig("key", "secret", "http://callback");`
`24`	`21`	`assertEquals("http://callback", config.getCallback());`
`25`	`22`	`assertEquals("key", config.getApiKey());`
`26`	`23`	`assertEquals("secret", config.getApiSecret());`