From bfbba77e4cdbfa4eeaf499b12790420e7392932d Mon Sep 17 00:00:00 2001 From: boncey Date: Sat, 14 Jan 2012 10:00:33 +0000 Subject: [PATCH 1/7] Added Flickr endpoint (not yet tested) --- .../org/scribe/builder/api/FlickrApi.java | 59 +++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 src/main/java/org/scribe/builder/api/FlickrApi.java diff --git a/src/main/java/org/scribe/builder/api/FlickrApi.java b/src/main/java/org/scribe/builder/api/FlickrApi.java new file mode 100644 index 0000000..9a6de40 --- /dev/null +++ b/src/main/java/org/scribe/builder/api/FlickrApi.java @@ -0,0 +1,59 @@ +package org.scribe.builder.api; + +import org.scribe.builder.api.DefaultApi10a; +import org.scribe.model.Token; +import org.scribe.utils.OAuthEncoder; + +/** + * OAuth API for Flickr. + * @author Darren Greaves + * @see Flickr API + */ +public class FlickrApi extends DefaultApi10a +{ + + /** + * {@inheritDoc} + */ + @Override + public String getAccessTokenEndpoint() + { + + return "http://www.flickr.com/services/oauth/access_token"; + } + + + /** + * {@inheritDoc} + */ + @Override + public String getAuthorizationUrl(Token requestToken) + { + + return "http://www.flickr.com/services/oauth/authorize?oauth_token=" + requestToken.getToken(); + } + + + /** + * {@inheritDoc} + */ + @Override + public String getRequestTokenEndpoint() + { + + return "http://www.flickr.com/services/oauth/request_token"; + } + + + /** + * Get request token endpoint with a callback URL. + * + * @param callbackUrl + * @return + */ + public String getRequestTokenEndpoint(String callbackUrl) + { + + return String.format("%s?oauth_callback=%s", getRequestTokenEndpoint(), OAuthEncoder.encode(callbackUrl)); + } +} From 41777bc0d0879562b0f312af2a749f792e72ea8b Mon Sep 17 00:00:00 2001 From: boncey Date: Thu, 26 Jan 2012 23:23:42 +0000 Subject: [PATCH 2/7] Removed unused callback method --- .../java/org/scribe/builder/api/FlickrApi.java | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/src/main/java/org/scribe/builder/api/FlickrApi.java b/src/main/java/org/scribe/builder/api/FlickrApi.java index 9a6de40..3a1efd3 100644 --- a/src/main/java/org/scribe/builder/api/FlickrApi.java +++ b/src/main/java/org/scribe/builder/api/FlickrApi.java @@ -1,11 +1,11 @@ package org.scribe.builder.api; -import org.scribe.builder.api.DefaultApi10a; + import org.scribe.model.Token; -import org.scribe.utils.OAuthEncoder; /** * OAuth API for Flickr. + * * @author Darren Greaves * @see Flickr API */ @@ -44,16 +44,4 @@ public class FlickrApi extends DefaultApi10a return "http://www.flickr.com/services/oauth/request_token"; } - - /** - * Get request token endpoint with a callback URL. - * - * @param callbackUrl - * @return - */ - public String getRequestTokenEndpoint(String callbackUrl) - { - - return String.format("%s?oauth_callback=%s", getRequestTokenEndpoint(), OAuthEncoder.encode(callbackUrl)); - } } From e000757d24094075a3a07c5f933026194578ba85 Mon Sep 17 00:00:00 2001 From: boncey Date: Sat, 28 Jan 2012 17:08:36 +0000 Subject: [PATCH 3/7] Added FlickrExample Example for Flickr OAuth --- .../org/scribe/examples/FlickrExample.java | 66 +++++++++++++++++++ 1 file changed, 66 insertions(+) create mode 100644 src/test/java/org/scribe/examples/FlickrExample.java diff --git a/src/test/java/org/scribe/examples/FlickrExample.java b/src/test/java/org/scribe/examples/FlickrExample.java new file mode 100644 index 0000000..6b282ea --- /dev/null +++ b/src/test/java/org/scribe/examples/FlickrExample.java @@ -0,0 +1,66 @@ +package org.scribe.examples; + + +import org.scribe.builder.ServiceBuilder; +import org.scribe.builder.api.FlickrApi; +import org.scribe.model.OAuthRequest; +import org.scribe.model.Response; +import org.scribe.model.Token; +import org.scribe.model.Verb; +import org.scribe.model.Verifier; +import org.scribe.oauth.OAuthService; + +import java.util.Scanner; + +public class FlickrExample +{ + private static final String PROTECTED_RESOURCE_URL = "http://api.flickr.com/services/rest/"; + + + public static void main(String[] args) + { + + // Replace these with your own api key and secret + String apiKey = "your_app_id"; + String apiSecret = "your_api_secret"; + OAuthService service = new ServiceBuilder().provider(FlickrApi.class).apiKey(apiKey).apiSecret(apiSecret).build(); + Scanner in = new Scanner(System.in); + + System.out.println("=== Flickr's OAuth Workflow ==="); + System.out.println(); + + // Obtain the Request Token + System.out.println("Fetching the Request Token..."); + Token requestToken = service.getRequestToken(); + System.out.println("Got the Request Token!"); + System.out.println(); + + System.out.println("Now go and authorize Scribe here:"); + String authorizationUrl = service.getAuthorizationUrl(requestToken); + System.out.println(authorizationUrl + "&perms=read"); + System.out.println("And paste the verifier here"); + System.out.print(">>"); + Verifier verifier = new Verifier(in.nextLine()); + System.out.println(); + + // Trade the Request Token and Verfier for the Access Token + System.out.println("Trading the Request Token for an Access Token..."); + Token accessToken = service.getAccessToken(requestToken, verifier); + System.out.println("Got the Access Token!"); + System.out.println("(if your curious it looks like this: " + accessToken + " )"); + System.out.println(); + + // Now let's go and ask for a protected resource! + System.out.println("Now we're going to access a protected resource..."); + OAuthRequest request = new OAuthRequest(Verb.GET, PROTECTED_RESOURCE_URL); + request.addQuerystringParameter("method", "flickr.test.login"); + service.signRequest(accessToken, request); + Response response = request.send(); + System.out.println("Got it! Lets see what we found..."); + System.out.println(); + System.out.println(response.getBody()); + + System.out.println(); + System.out.println("Thats it man! Go and build something awesome with Scribe! :)"); + } +} From b13181af35dc32d330c3917ff75bf5ceebe0944b Mon Sep 17 00:00:00 2001 From: boncey Date: Sun, 29 Jan 2012 17:09:40 +0000 Subject: [PATCH 4/7] Removed blank line --- src/test/java/org/scribe/examples/FlickrExample.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/test/java/org/scribe/examples/FlickrExample.java b/src/test/java/org/scribe/examples/FlickrExample.java index 6b282ea..cf58147 100644 --- a/src/test/java/org/scribe/examples/FlickrExample.java +++ b/src/test/java/org/scribe/examples/FlickrExample.java @@ -16,7 +16,6 @@ public class FlickrExample { private static final String PROTECTED_RESOURCE_URL = "http://api.flickr.com/services/rest/"; - public static void main(String[] args) { From 4dd7aa0bc2b6f8cf3cf1a5e4c01ad03f26a9e97a Mon Sep 17 00:00:00 2001 From: boncey Date: Tue, 21 Feb 2012 20:27:33 +0000 Subject: [PATCH 5/7] Reformatted code to scribe's standards --- .../org/scribe/builder/api/FlickrApi.java | 58 +++++------ .../org/scribe/examples/FlickrExample.java | 99 +++++++++---------- 2 files changed, 74 insertions(+), 83 deletions(-) diff --git a/src/main/java/org/scribe/builder/api/FlickrApi.java b/src/main/java/org/scribe/builder/api/FlickrApi.java index 3a1efd3..81dc986 100644 --- a/src/main/java/org/scribe/builder/api/FlickrApi.java +++ b/src/main/java/org/scribe/builder/api/FlickrApi.java @@ -1,7 +1,6 @@ package org.scribe.builder.api; - -import org.scribe.model.Token; +import org.scribe.model.*; /** * OAuth API for Flickr. @@ -12,36 +11,31 @@ import org.scribe.model.Token; public class FlickrApi extends DefaultApi10a { - /** - * {@inheritDoc} - */ - @Override - public String getAccessTokenEndpoint() - { + /** + * {@inheritDoc} + */ + @Override + public String getAccessTokenEndpoint() + { + return "http://www.flickr.com/services/oauth/access_token"; + } - return "http://www.flickr.com/services/oauth/access_token"; - } - - - /** - * {@inheritDoc} - */ - @Override - public String getAuthorizationUrl(Token requestToken) - { - - return "http://www.flickr.com/services/oauth/authorize?oauth_token=" + requestToken.getToken(); - } - - - /** - * {@inheritDoc} - */ - @Override - public String getRequestTokenEndpoint() - { - - return "http://www.flickr.com/services/oauth/request_token"; - } + /** + * {@inheritDoc} + */ + @Override + public String getAuthorizationUrl(Token requestToken) + { + return "http://www.flickr.com/services/oauth/authorize?oauth_token=" + + requestToken.getToken(); + } + /** + * {@inheritDoc} + */ + @Override + public String getRequestTokenEndpoint() + { + return "http://www.flickr.com/services/oauth/request_token"; + } } diff --git a/src/test/java/org/scribe/examples/FlickrExample.java b/src/test/java/org/scribe/examples/FlickrExample.java index cf58147..946c85c 100644 --- a/src/test/java/org/scribe/examples/FlickrExample.java +++ b/src/test/java/org/scribe/examples/FlickrExample.java @@ -1,65 +1,62 @@ package org.scribe.examples; +import org.scribe.builder.*; +import org.scribe.builder.api.*; +import org.scribe.model.*; +import org.scribe.oauth.*; -import org.scribe.builder.ServiceBuilder; -import org.scribe.builder.api.FlickrApi; -import org.scribe.model.OAuthRequest; -import org.scribe.model.Response; -import org.scribe.model.Token; -import org.scribe.model.Verb; -import org.scribe.model.Verifier; -import org.scribe.oauth.OAuthService; - -import java.util.Scanner; +import java.util.*; public class FlickrExample { - private static final String PROTECTED_RESOURCE_URL = "http://api.flickr.com/services/rest/"; + private static final String PROTECTED_RESOURCE_URL = "http://api.flickr.com/services/rest/"; - public static void main(String[] args) - { + public static void main(String[] args) + { + // Replace these with your own api key and secret + String apiKey = "your_app_id"; + String apiSecret = "your_api_secret"; + OAuthService service = new ServiceBuilder().provider(FlickrApi.class) + .apiKey(apiKey).apiSecret(apiSecret).build(); + Scanner in = new Scanner(System.in); - // Replace these with your own api key and secret - String apiKey = "your_app_id"; - String apiSecret = "your_api_secret"; - OAuthService service = new ServiceBuilder().provider(FlickrApi.class).apiKey(apiKey).apiSecret(apiSecret).build(); - Scanner in = new Scanner(System.in); + System.out.println("=== Flickr's OAuth Workflow ==="); + System.out.println(); - System.out.println("=== Flickr's OAuth Workflow ==="); - System.out.println(); + // Obtain the Request Token + System.out.println("Fetching the Request Token..."); + Token requestToken = service.getRequestToken(); + System.out.println("Got the Request Token!"); + System.out.println(); - // Obtain the Request Token - System.out.println("Fetching the Request Token..."); - Token requestToken = service.getRequestToken(); - System.out.println("Got the Request Token!"); - System.out.println(); + System.out.println("Now go and authorize Scribe here:"); + String authorizationUrl = service.getAuthorizationUrl(requestToken); + System.out.println(authorizationUrl + "&perms=read"); + System.out.println("And paste the verifier here"); + System.out.print(">>"); + Verifier verifier = new Verifier(in.nextLine()); + System.out.println(); - System.out.println("Now go and authorize Scribe here:"); - String authorizationUrl = service.getAuthorizationUrl(requestToken); - System.out.println(authorizationUrl + "&perms=read"); - System.out.println("And paste the verifier here"); - System.out.print(">>"); - Verifier verifier = new Verifier(in.nextLine()); - System.out.println(); + // Trade the Request Token and Verfier for the Access Token + System.out.println("Trading the Request Token for an Access Token..."); + Token accessToken = service.getAccessToken(requestToken, verifier); + System.out.println("Got the Access Token!"); + System.out.println("(if your curious it looks like this: " + accessToken + + " )"); + System.out.println(); - // Trade the Request Token and Verfier for the Access Token - System.out.println("Trading the Request Token for an Access Token..."); - Token accessToken = service.getAccessToken(requestToken, verifier); - System.out.println("Got the Access Token!"); - System.out.println("(if your curious it looks like this: " + accessToken + " )"); - System.out.println(); + // Now let's go and ask for a protected resource! + System.out.println("Now we're going to access a protected resource..."); + OAuthRequest request = new OAuthRequest(Verb.GET, PROTECTED_RESOURCE_URL); + request.addQuerystringParameter("method", "flickr.test.login"); + service.signRequest(accessToken, request); + Response response = request.send(); + System.out.println("Got it! Lets see what we found..."); + System.out.println(); + System.out.println(response.getBody()); - // Now let's go and ask for a protected resource! - System.out.println("Now we're going to access a protected resource..."); - OAuthRequest request = new OAuthRequest(Verb.GET, PROTECTED_RESOURCE_URL); - request.addQuerystringParameter("method", "flickr.test.login"); - service.signRequest(accessToken, request); - Response response = request.send(); - System.out.println("Got it! Lets see what we found..."); - System.out.println(); - System.out.println(response.getBody()); - - System.out.println(); - System.out.println("Thats it man! Go and build something awesome with Scribe! :)"); - } + System.out.println(); + System.out + .println("Thats it man! Go and build something awesome with Scribe! :)"); + } } From 1e05fc08287fefe0e8b7ed632b6e1a40bb8c88b6 Mon Sep 17 00:00:00 2001 From: boncey Date: Tue, 21 Feb 2012 20:31:33 +0000 Subject: [PATCH 6/7] Eclipse formatter and importorder config --- src/main/config/scribe-eclipse-formatter.xml | 290 +++++++++++++++++++ src/main/config/scribe-eclipse.importorder | 7 + 2 files changed, 297 insertions(+) create mode 100644 src/main/config/scribe-eclipse-formatter.xml create mode 100644 src/main/config/scribe-eclipse.importorder diff --git a/src/main/config/scribe-eclipse-formatter.xml b/src/main/config/scribe-eclipse-formatter.xml new file mode 100644 index 0000000..8d3ecbc --- /dev/null +++ b/src/main/config/scribe-eclipse-formatter.xml @@ -0,0 +1,290 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/config/scribe-eclipse.importorder b/src/main/config/scribe-eclipse.importorder new file mode 100644 index 0000000..1fcaf0f --- /dev/null +++ b/src/main/config/scribe-eclipse.importorder @@ -0,0 +1,7 @@ +#Organize Import Order +#Tue Feb 21 20:29:55 GMT 2012 +4=java +3=javax +2=org +1=org.boncey +0=com From 9e848993f68b92cf0a40240a44885d57cdde9f18 Mon Sep 17 00:00:00 2001 From: boncey Date: Tue, 21 Feb 2012 23:13:05 +0000 Subject: [PATCH 7/7] Removed line length and reformatted --- src/main/config/scribe-eclipse-formatter.xml | 6 +++--- src/main/java/org/scribe/builder/api/FlickrApi.java | 3 +-- src/test/java/org/scribe/examples/FlickrExample.java | 9 +++------ 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/src/main/config/scribe-eclipse-formatter.xml b/src/main/config/scribe-eclipse-formatter.xml index 8d3ecbc..8ea5bc9 100644 --- a/src/main/config/scribe-eclipse-formatter.xml +++ b/src/main/config/scribe-eclipse-formatter.xml @@ -53,7 +53,7 @@ - + @@ -73,7 +73,7 @@ - + @@ -204,7 +204,7 @@ - + diff --git a/src/main/java/org/scribe/builder/api/FlickrApi.java b/src/main/java/org/scribe/builder/api/FlickrApi.java index 81dc986..a630436 100644 --- a/src/main/java/org/scribe/builder/api/FlickrApi.java +++ b/src/main/java/org/scribe/builder/api/FlickrApi.java @@ -26,8 +26,7 @@ public class FlickrApi extends DefaultApi10a @Override public String getAuthorizationUrl(Token requestToken) { - return "http://www.flickr.com/services/oauth/authorize?oauth_token=" - + requestToken.getToken(); + return "http://www.flickr.com/services/oauth/authorize?oauth_token=" + requestToken.getToken(); } /** diff --git a/src/test/java/org/scribe/examples/FlickrExample.java b/src/test/java/org/scribe/examples/FlickrExample.java index 946c85c..ac38ad3 100644 --- a/src/test/java/org/scribe/examples/FlickrExample.java +++ b/src/test/java/org/scribe/examples/FlickrExample.java @@ -16,8 +16,7 @@ public class FlickrExample // Replace these with your own api key and secret String apiKey = "your_app_id"; String apiSecret = "your_api_secret"; - OAuthService service = new ServiceBuilder().provider(FlickrApi.class) - .apiKey(apiKey).apiSecret(apiSecret).build(); + OAuthService service = new ServiceBuilder().provider(FlickrApi.class).apiKey(apiKey).apiSecret(apiSecret).build(); Scanner in = new Scanner(System.in); System.out.println("=== Flickr's OAuth Workflow ==="); @@ -41,8 +40,7 @@ public class FlickrExample System.out.println("Trading the Request Token for an Access Token..."); Token accessToken = service.getAccessToken(requestToken, verifier); System.out.println("Got the Access Token!"); - System.out.println("(if your curious it looks like this: " + accessToken - + " )"); + System.out.println("(if your curious it looks like this: " + accessToken + " )"); System.out.println(); // Now let's go and ask for a protected resource! @@ -56,7 +54,6 @@ public class FlickrExample System.out.println(response.getBody()); System.out.println(); - System.out - .println("Thats it man! Go and build something awesome with Scribe! :)"); + System.out.println("Thats it man! Go and build something awesome with Scribe! :)"); } }