Skip to content

Commit cad7e9a

Browse files
kullfarkullfar
committed
refactor example a bit
1 parent ac8ff60 commit cad7e9a

2 files changed

Lines changed: 26 additions & 8 deletions

File tree

‎scribejava-apis/src/test/java/com/github/scribejava/apis/examples/SalesforceExample.java‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import com.github.scribejava.apis.SalesforceApi;
99
import com.github.scribejava.apis.salesforce.SalesforceToken;
1010
import com.github.scribejava.core.builder.ServiceBuilder;
11+
import com.github.scribejava.core.model.OAuth2AccessToken;
1112
import com.github.scribejava.core.model.OAuthRequest;
1213
import com.github.scribejava.core.model.Response;
1314
import com.github.scribejava.core.model.Verb;
@@ -66,13 +67,21 @@ public static void main(String... args) throws IOException, NoSuchAlgorithmExcep
6667

6768
// Trade the Request Token and Verifier for the Access Token
6869
System.out.println("Trading the Request Token for an Access Token...");
69-
final SalesforceToken accessToken = (SalesforceToken) service.getAccessToken(codeEncoded);
70+
71+
final OAuth2AccessToken accessToken = service.getAccessToken(codeEncoded);
72+
final SalesforceToken salesforceAccessToken;
73+
if (accessToken instanceof SalesforceToken) {
74+
salesforceAccessToken = (SalesforceToken) accessToken;
75+
} else {
76+
throw new IllegalStateException("Salesforce API didn't return SalesforceToken.");
77+
}
7078
System.out.println("Got the Access Token!");
71-
System.out.println("(if your curious it looks like this: " + accessToken + ", 'rawResponse'='"
79+
80+
System.out.println("(if your curious it looks like this: " + salesforceAccessToken + ", 'rawResponse'='"
7281
+ accessToken.getRawResponse() + "')");
7382
System.out.println();
7483

75-
System.out.println("instance_url is: " + accessToken.getInstanceUrl());
84+
System.out.println("instance_url is: " + salesforceAccessToken.getInstanceUrl());
7685

7786
// Now let's go and ask for a protected resource!
7887
System.out.println("Now we're reading accounts from the Salesforce org (maxing them to 10).");
@@ -81,7 +90,7 @@ public static void main(String... args) throws IOException, NoSuchAlgorithmExcep
8190
final String queryEncoded = URLEncoder.encode("Select Id, Name from Account LIMIT 10", "UTF-8");
8291

8392
// Building the query URI. We've parsed the instance URL from the accessToken request.
84-
final String url = accessToken.getInstanceUrl() + "/services/data/v36.0/query?q=" + queryEncoded;
93+
final String url = salesforceAccessToken.getInstanceUrl() + "/services/data/v36.0/query?q=" + queryEncoded;
8594

8695
System.out.println();
8796
System.out.println("Full URL: " + url);

‎scribejava-apis/src/test/java/com/github/scribejava/apis/examples/SalesforceNingAsyncExample.java‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import com.github.scribejava.apis.salesforce.SalesforceToken;
1212
import com.github.scribejava.httpclient.ning.NingHttpClientConfig;
1313
import com.github.scribejava.core.builder.ServiceBuilder;
14+
import com.github.scribejava.core.model.OAuth2AccessToken;
1415
import com.github.scribejava.core.model.OAuthRequest;
1516
import com.github.scribejava.core.model.Response;
1617
import com.github.scribejava.core.model.Verb;
@@ -67,19 +68,27 @@ public static void main(String... args) throws InterruptedException, ExecutionEx
6768
final String codeEncoded = URLDecoder.decode(code, "UTF-8");
6869
// Trade the Request Token and Verifier for the Access Token
6970
System.out.println("Trading the Request Token for an Access Token...");
70-
final SalesforceToken accessToken = (SalesforceToken) service.getAccessToken(codeEncoded);
71+
72+
final OAuth2AccessToken accessToken = service.getAccessToken(codeEncoded);
73+
final SalesforceToken salesforceAccessToken;
74+
if (accessToken instanceof SalesforceToken) {
75+
salesforceAccessToken = (SalesforceToken) accessToken;
76+
} else {
77+
throw new IllegalStateException("Salesforce API didn't return SalesforceToken.");
78+
}
7179
System.out.println("Got the Access Token!");
72-
System.out.println("(if your curious it looks like this: " + accessToken
80+
81+
System.out.println("(if your curious it looks like this: " + salesforceAccessToken
7382
+ ", 'rawResponse'='" + accessToken.getRawResponse() + "')");
7483
System.out.println();
75-
System.out.println("Instance is: " + accessToken.getInstanceUrl());
84+
System.out.println("Instance is: " + salesforceAccessToken.getInstanceUrl());
7685
// Now let's go and ask for a protected resource!
7786
System.out.println("Now we're reading accounts from the Salesforce org (maxing them to 10).");
7887
// Sample SOQL statement
7988
final String queryEncoded = URLEncoder.encode("Select Id, Name from Account LIMIT 10", "UTF-8");
8089
// Building the query URI. We've parsed the instance URL from the
8190
// accessToken request.
82-
final String url = accessToken.getInstanceUrl() + "/services/data/v36.0/query?q=" + queryEncoded;
91+
final String url = salesforceAccessToken.getInstanceUrl() + "/services/data/v36.0/query?q=" + queryEncoded;
8392
System.out.println();
8493
System.out.println("Full URL: " + url);
8594
final OAuthRequest request = new OAuthRequest(Verb.GET, url);

0 commit comments

Comments
 (0)