Removed endpoints and verbs from config (they are in the Api object anyways)
This commit is contained in:
1 parent
0be82d6832
commit
8f0760664f
4 files changed
+5
-56
No files matched your search
@@ -95,10 +95,6 @@ public abstract class DefaultApi10a implements Api
|
|||||||
private OAuthConfig createConfig(String apiKey, String apiSecret, String callback)
|
private OAuthConfig createConfig(String apiKey, String apiSecret, String callback)
|
||||||
{
|
{
|
||||||
OAuthConfig config = new OAuthConfig();
|
OAuthConfig config = new OAuthConfig();
|
||||||
config.setRequestTokenVerb(getRequestTokenVerb());
|
|
||||||
config.setRequestTokenEndpoint(getRequestTokenEndpoint());
|
|
||||||
config.setAccessTokenVerb(getAccessTokenVerb());
|
|
||||||
config.setAccessTokenEndpoint(getAccessTokenEndpoint());
|
|
||||||
config.setApiKey(apiKey);
|
config.setApiKey(apiKey);
|
||||||
config.setApiSecret(apiSecret);
|
config.setApiSecret(apiSecret);
|
||||||
config.setCallback(callback);
|
config.setCallback(callback);
|
||||||
|
|||||||
@@ -10,10 +10,6 @@ public class OAuthConfig
|
|||||||
private String apiKey;
|
private String apiKey;
|
||||||
private String apiSecret;
|
private String apiSecret;
|
||||||
private String callback;
|
private String callback;
|
||||||
private String requestTokenEndpoint;
|
|
||||||
private String accessTokenEndpoint;
|
|
||||||
private Verb requestTokenVerb;
|
|
||||||
private Verb accessTokenVerb;
|
|
||||||
|
|
||||||
public String getApiKey()
|
public String getApiKey()
|
||||||
{
|
{
|
||||||
@@ -44,45 +40,4 @@ public class OAuthConfig
|
|||||||
{
|
{
|
||||||
this.callback = 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;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -59,7 +59,7 @@ public class OAuth10aServiceImpl implements OAuthService
|
|||||||
*/
|
*/
|
||||||
public Token getAccessToken(Token requestToken, Verifier verifier)
|
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.TOKEN, requestToken.getToken());
|
||||||
request.addOAuthParameter(OAuthConstants.VERIFIER, verifier.getValue());
|
request.addOAuthParameter(OAuthConstants.VERIFIER, verifier.getValue());
|
||||||
addOAuthParams(request, requestToken);
|
addOAuthParams(request, requestToken);
|
||||||
|
|||||||
@@ -11,8 +11,6 @@ public class OAuthConfigTest
|
|||||||
public void shouldReturnDefaultValuesIfNotSet()
|
public void shouldReturnDefaultValuesIfNotSet()
|
||||||
{
|
{
|
||||||
OAuthConfig config = new OAuthConfig();
|
OAuthConfig config = new OAuthConfig();
|
||||||
assertEquals(Verb.GET, config.getAccessTokenVerb());
|
|
||||||
assertEquals(Verb.GET, config.getRequestTokenVerb());
|
|
||||||
assertEquals(OAuthConstants.OUT_OF_BAND, config.getCallback());
|
assertEquals(OAuthConstants.OUT_OF_BAND, config.getCallback());
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -21,11 +19,11 @@ public class OAuthConfigTest
|
|||||||
{
|
{
|
||||||
OAuthConfig config = new OAuthConfig();
|
OAuthConfig config = new OAuthConfig();
|
||||||
config.setCallback("http://callback");
|
config.setCallback("http://callback");
|
||||||
config.setAccessTokenVerb(Verb.POST);
|
config.setApiKey("key");
|
||||||
config.setRequestTokenVerb(Verb.POST);
|
config.setApiSecret("secret");
|
||||||
assertEquals("http://callback", config.getCallback());
|
assertEquals("http://callback", config.getCallback());
|
||||||
assertEquals(Verb.POST, config.getAccessTokenVerb());
|
assertEquals("key", config.getApiKey());
|
||||||
assertEquals(Verb.POST, config.getRequestTokenVerb());
|
assertEquals("secret", config.getApiSecret());
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
Reference in new issue
Block a user