From 0e5ae92d3e7ac6c8304d39d41f83942c15605aaf Mon Sep 17 00:00:00 2001 From: Pablo Fernandez Date: Fri, 7 Jan 2011 13:05:58 -0300 Subject: [PATCH] Added exceptions to both token methods on 2.0 service Rebased 1.0.9 --- src/main/java/org/scribe/builder/api/GoogleApi.java | 4 ++-- src/main/java/org/scribe/builder/api/LinkedInApi.java | 6 ++++-- src/main/java/org/scribe/oauth/OAuth2ServiceImpl.java | 4 ++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/scribe/builder/api/GoogleApi.java b/src/main/java/org/scribe/builder/api/GoogleApi.java index 4547d03..9c86e5e 100644 --- a/src/main/java/org/scribe/builder/api/GoogleApi.java +++ b/src/main/java/org/scribe/builder/api/GoogleApi.java @@ -19,13 +19,13 @@ public class GoogleApi extends DefaultApi10a } @Override - protected Verb getAccessTokenVerb() + public Verb getAccessTokenVerb() { return Verb.GET; } @Override - protected Verb getRequestTokenVerb() + public Verb getRequestTokenVerb() { return Verb.GET; } diff --git a/src/main/java/org/scribe/builder/api/LinkedInApi.java b/src/main/java/org/scribe/builder/api/LinkedInApi.java index 6450225..f459404 100644 --- a/src/main/java/org/scribe/builder/api/LinkedInApi.java +++ b/src/main/java/org/scribe/builder/api/LinkedInApi.java @@ -1,17 +1,19 @@ package org.scribe.builder.api; +import org.scribe.model.*; + public class LinkedInApi extends DefaultApi10a { private static final String AUTHORIZE_URL = "https://api.linkedin.com/uas/oauth/authorize?oauth_token=%s"; @Override - protected String getAccessTokenEndpoint() + public String getAccessTokenEndpoint() { return "https://api.linkedin.com/uas/oauth/accessToken"; } @Override - protected String getRequestTokenEndpoint() + public String getRequestTokenEndpoint() { return "https://api.linkedin.com/uas/oauth/requestToken"; } diff --git a/src/main/java/org/scribe/oauth/OAuth2ServiceImpl.java b/src/main/java/org/scribe/oauth/OAuth2ServiceImpl.java index be2183f..0c4e768 100644 --- a/src/main/java/org/scribe/oauth/OAuth2ServiceImpl.java +++ b/src/main/java/org/scribe/oauth/OAuth2ServiceImpl.java @@ -23,13 +23,13 @@ public class OAuth2ServiceImpl implements OAuthService @Override public Token getAccessToken(Token requestToken, Verifier verifier) { - return null; + throw new UnsupportedOperationException("Unsupported operation, please use 'getAuthorizationUrl' and redirect your users there"); } @Override public Token getRequestToken() { - throw new UnsupportedOperationException("OAuth 2 does not use request tokens. Use 'getAccessToken' directly"); + throw new UnsupportedOperationException("Unsupported operation, please use 'getAuthorizationUrl' and redirect your users there"); } @Override