Added exceptions to both token methods on 2.0 service

fernandezpablo85 · fernandezpablo85 · commit 0e5ae92d3e7a · 2011-01-07T13:24:18.000-03:00
Rebased 1.0.9
diff --git 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 String getRequestTokenEndpoint()
   }
 
   @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
@@ -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
@@ -23,13 +23,13 @@ public void addScope(String scope)
   @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

Original file line number	Diff line number	Diff line change
`@@ -19,13 +19,13 @@ public String getRequestTokenEndpoint()`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`@Override`
`22`		`- protected Verb getAccessTokenVerb()`
	`22`	`+ public Verb getAccessTokenVerb()`
`23`	`23`	`{`
`24`	`24`	`return Verb.GET;`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`@Override`
`28`		`- protected Verb getRequestTokenVerb()`
	`28`	`+ public Verb getRequestTokenVerb()`
`29`	`29`	`{`
`30`	`30`	`return Verb.GET;`
`31`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,17 +1,19 @@`
`1`	`1`	`package org.scribe.builder.api;`
`2`	`2`
	`3`	`+import org.scribe.model.*;`
	`4`	`+`
`3`	`5`	`public class LinkedInApi extends DefaultApi10a`
`4`	`6`	`{`
`5`	`7`	`private static final String AUTHORIZE_URL = "https://api.linkedin.com/uas/oauth/authorize?oauth_token=%s";`
`6`	`8`
`7`	`9`	`@Override`
`8`		`- protected String getAccessTokenEndpoint()`
	`10`	`+ public String getAccessTokenEndpoint()`
`9`	`11`	`{`
`10`	`12`	`return "https://api.linkedin.com/uas/oauth/accessToken";`
`11`	`13`	`}`
`12`	`14`
`13`	`15`	`@Override`
`14`		`- protected String getRequestTokenEndpoint()`
	`16`	`+ public String getRequestTokenEndpoint()`
`15`	`17`	`{`
`16`	`18`	`return "https://api.linkedin.com/uas/oauth/requestToken";`
`17`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,13 +23,13 @@ public void addScope(String scope)`
`23`	`23`	`@Override`
`24`	`24`	`public Token getAccessToken(Token requestToken, Verifier verifier)`
`25`	`25`	`{`
`26`		`- return null;`
	`26`	`+ throw new UnsupportedOperationException("Unsupported operation, please use 'getAuthorizationUrl' and redirect your users there");`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`@Override`
`30`	`30`	`public Token getRequestToken()`
`31`	`31`	`{`
`32`		`- throw new UnsupportedOperationException("OAuth 2 does not use request tokens. Use 'getAccessToken' directly");`
	`32`	`+ throw new UnsupportedOperationException("Unsupported operation, please use 'getAuthorizationUrl' and redirect your users there");`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`@Override`