From 8f0760664f270fae50a7a1cc3a217a4806d95adc Mon Sep 17 00:00:00 2001
From: Pablo Fernandez <fernandezpablo85@gmail.com>
Date: Sun, 7 Nov 2010 18:16:37 -0300
Subject: [PATCH] Removed endpoints and verbs from config (they are in the Api
 object anyways)

---
 .../org/scribe/builder/api/DefaultApi10a.java |  4 --
 .../java/org/scribe/model/OAuthConfig.java    | 45 -------------------
 .../org/scribe/oauth/OAuth10aServiceImpl.java |  2 +-
 .../org/scribe/model/OAuthConfigTest.java     | 10 ++---
 4 files changed, 5 insertions(+), 56 deletions(-)

diff --git a/src/main/java/org/scribe/builder/api/DefaultApi10a.java b/src/main/java/org/scribe/builder/api/DefaultApi10a.java
index 8af00b8..d25c0c3 100644
--- a/src/main/java/org/scribe/builder/api/DefaultApi10a.java
+++ b/src/main/java/org/scribe/builder/api/DefaultApi10a.java
@@ -95,10 +95,6 @@ public abstract class DefaultApi10a implements Api
   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
index 2521d57..ce9ff64 100644
--- 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 class OAuthConfig
   {
     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;
-  }
-
 }
\ No newline at end of file
diff --git a/src/main/java/org/scribe/oauth/OAuth10aServiceImpl.java b/src/main/java/org/scribe/oauth/OAuth10aServiceImpl.java
index 1034b19..beff90f 100644
--- a/src/main/java/org/scribe/oauth/OAuth10aServiceImpl.java
+++ b/src/main/java/org/scribe/oauth/OAuth10aServiceImpl.java
@@ -59,7 +59,7 @@ public class OAuth10aServiceImpl implements OAuthService
    */
   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
index 1bffac5..0c442f8 100644
--- 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 class OAuthConfigTest
   {
     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());
   }
 
 }