Removed endpoints and verbs from config (they are in the Api object anyways)

fernandezpablo85 · fernandezpablo85 · commit 8f0760664f27 · 2011-01-07T13:10:42.000-03:00
diff --git a/src/main/java/org/scribe/builder/api/DefaultApi10a.java b/src/main/java/org/scribe/builder/api/DefaultApi10a.java
@@ -95,10 +95,6 @@ private OAuthService createService(String apiKey, String apiSecret, String callb
   private OAuthConfig createConfig(String apiKey, String apiSecret, String callback)
   {
     OAuthConfig config = new OAuthConfig();
-    config.setRequestTokenVerb(getRequestTokenVerb());
-    config.setRequestTokenEndpoint(getRequestTokenEndpoint());
-    config.setAccessTokenVerb(getAccessTokenVerb());
-    config.setAccessTokenEndpoint(getAccessTokenEndpoint());
     config.setApiKey(apiKey);
     config.setApiSecret(apiSecret);
     config.setCallback(callback);
diff --git a/src/main/java/org/scribe/model/OAuthConfig.java b/src/main/java/org/scribe/model/OAuthConfig.java
@@ -10,10 +10,6 @@ public class OAuthConfig
   private String apiKey;
   private String apiSecret;
   private String callback;
-  private String requestTokenEndpoint;
-  private String accessTokenEndpoint;
-  private Verb requestTokenVerb;
-  private Verb accessTokenVerb;
 
   public String getApiKey()
   {
@@ -44,45 +40,4 @@ public void setCallback(String callback)
   {
     this.callback = callback;
   }
-
-  public String getRequestTokenEndpoint()
-  {
-    return requestTokenEndpoint;
-  }
-
-  public void setRequestTokenEndpoint(String requestTokenEndpoint)
-  {
-    this.requestTokenEndpoint = requestTokenEndpoint;
-  }
-
-  public String getAccessTokenEndpoint()
-  {
-    return accessTokenEndpoint;
-  }
-
-  public void setAccessTokenEndpoint(String accessTokenEndpoint)
-  {
-    this.accessTokenEndpoint = accessTokenEndpoint;
-  }
-
-  public Verb getRequestTokenVerb()
-  {
-    return requestTokenVerb != null ? requestTokenVerb : Verb.GET;
-  }
-
-  public void setRequestTokenVerb(Verb requestTokenVerb)
-  {
-    this.requestTokenVerb = requestTokenVerb;
-  }
-
-  public Verb getAccessTokenVerb()
-  {
-    return accessTokenVerb != null ? accessTokenVerb : Verb.GET;
-  }
-
-  public void setAccessTokenVerb(Verb accessTokenVerb)
-  {
-    this.accessTokenVerb = accessTokenVerb;
-  }
-
 }
diff --git a/src/main/java/org/scribe/oauth/OAuth10aServiceImpl.java b/src/main/java/org/scribe/oauth/OAuth10aServiceImpl.java
@@ -59,7 +59,7 @@ private void addOAuthParams(OAuthRequest request, Token token)
    */
   public Token getAccessToken(Token requestToken, Verifier verifier)
   {
-    OAuthRequest request = new OAuthRequest(config.getAccessTokenVerb(), config.getAccessTokenEndpoint());
+    OAuthRequest request = new OAuthRequest(api.getAccessTokenVerb(), api.getAccessTokenEndpoint());
     request.addOAuthParameter(OAuthConstants.TOKEN, requestToken.getToken());
     request.addOAuthParameter(OAuthConstants.VERIFIER, verifier.getValue());
     addOAuthParams(request, requestToken);
diff --git a/src/test/java/org/scribe/model/OAuthConfigTest.java b/src/test/java/org/scribe/model/OAuthConfigTest.java
@@ -11,8 +11,6 @@ public class OAuthConfigTest
   public void shouldReturnDefaultValuesIfNotSet()
   {
     OAuthConfig config = new OAuthConfig();
-    assertEquals(Verb.GET, config.getAccessTokenVerb());
-    assertEquals(Verb.GET, config.getRequestTokenVerb());
     assertEquals(OAuthConstants.OUT_OF_BAND, config.getCallback());
   }
 
@@ -21,11 +19,11 @@ public void shouldOverrideDefaultsIfSet()
   {
     OAuthConfig config = new OAuthConfig();
     config.setCallback("http://callback");
-    config.setAccessTokenVerb(Verb.POST);
-    config.setRequestTokenVerb(Verb.POST);
+    config.setApiKey("key");
+    config.setApiSecret("secret");
     assertEquals("http://callback", config.getCallback());
-    assertEquals(Verb.POST, config.getAccessTokenVerb());
-    assertEquals(Verb.POST, config.getRequestTokenVerb());
+    assertEquals("key", config.getApiKey());
+    assertEquals("secret", config.getApiSecret());
   }
 
 }

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ private void addOAuthParams(OAuthRequest request, Token token)`
`59`	`59`	`*/`
`60`	`60`	`public Token getAccessToken(Token requestToken, Verifier verifier)`
`61`	`61`	`{`
`62`		`- OAuthRequest request = new OAuthRequest(config.getAccessTokenVerb(), config.getAccessTokenEndpoint());`
	`62`	`+ OAuthRequest request = new OAuthRequest(api.getAccessTokenVerb(), api.getAccessTokenEndpoint());`
`63`	`63`	`request.addOAuthParameter(OAuthConstants.TOKEN, requestToken.getToken());`
`64`	`64`	`request.addOAuthParameter(OAuthConstants.VERIFIER, verifier.getValue());`
`65`	`65`	`addOAuthParams(request, requestToken);`
Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,6 @@ public class OAuthConfigTest`
`11`	`11`	`public void shouldReturnDefaultValuesIfNotSet()`
`12`	`12`	`{`
`13`	`13`	`OAuthConfig config = new OAuthConfig();`
`14`		`- assertEquals(Verb.GET, config.getAccessTokenVerb());`
`15`		`- assertEquals(Verb.GET, config.getRequestTokenVerb());`
`16`	`14`	`assertEquals(OAuthConstants.OUT_OF_BAND, config.getCallback());`
`17`	`15`	`}`
`18`	`16`
`@@ -21,11 +19,11 @@ public void shouldOverrideDefaultsIfSet()`
`21`	`19`	`{`
`22`	`20`	`OAuthConfig config = new OAuthConfig();`
`23`	`21`	`config.setCallback("http://callback");`
`24`		`- config.setAccessTokenVerb(Verb.POST);`
`25`		`- config.setRequestTokenVerb(Verb.POST);`
	`22`	`+ config.setApiKey("key");`
	`23`	`+ config.setApiSecret("secret");`
`26`	`24`	`assertEquals("http://callback", config.getCallback());`
`27`		`- assertEquals(Verb.POST, config.getAccessTokenVerb());`
`28`		`- assertEquals(Verb.POST, config.getRequestTokenVerb());`
	`25`	`+ assertEquals("key", config.getApiKey());`
	`26`	`+ assertEquals("secret", config.getApiSecret());`
`29`	`27`	`}`
`30`	`28`
`31`	`29`	`}`