Skip to content

Commit 2751f52

Browse files
committed
simplify async/sync usages
1 parent fe5f0f3 commit 2751f52

File tree

10 files changed

+210
-303
lines changed

10 files changed

+210
-303
lines changed

changelog

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
[SNAPSHOT]
2+
* simplify async/sync usages
3+
14
[2.5.3]
25
* fix - do not send two Content-Type header in async requests
36
* improve OK example

scribejava-apis/src/test/java/com/github/scribejava/apis/examples/FacebookAsyncExample.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import java.util.Scanner;
66
import java.util.concurrent.ExecutionException;
77
import com.github.scribejava.apis.FacebookApi;
8-
import com.github.scribejava.core.builder.ServiceBuilderAsync;
8+
import com.github.scribejava.core.builder.ServiceBuilder;
99
import com.github.scribejava.core.model.ForceTypeOfHttpRequest;
1010
import com.github.scribejava.core.model.OAuth2AccessToken;
1111
import com.github.scribejava.core.model.OAuthRequestAsync;
@@ -33,7 +33,7 @@ public static void main(String... args) throws InterruptedException, ExecutionEx
3333
.setReadTimeout(1_000)
3434
.build();
3535

36-
final OAuth20Service service = new ServiceBuilderAsync()
36+
final OAuth20Service service = new ServiceBuilder()
3737
.apiKey(clientId)
3838
.apiSecret(clientSecret)
3939
.state(secretState)

scribejava-apis/src/test/java/com/github/scribejava/apis/examples/Google20AsyncExample.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import java.util.Random;
44
import java.util.Scanner;
55
import com.github.scribejava.apis.GoogleApi20;
6-
import com.github.scribejava.core.builder.ServiceBuilderAsync;
6+
import com.github.scribejava.core.builder.ServiceBuilder;
77
import com.github.scribejava.core.model.ForceTypeOfHttpRequest;
88
import com.github.scribejava.core.model.OAuth2AccessToken;
99
import com.github.scribejava.core.model.OAuthRequestAsync;
@@ -35,7 +35,7 @@ public static void main(String... args) throws InterruptedException, ExecutionEx
3535
.setReadTimeout(1_000)
3636
.build();
3737

38-
final OAuth20Service service = new ServiceBuilderAsync()
38+
final OAuth20Service service = new ServiceBuilder()
3939
.apiKey(clientId)
4040
.apiSecret(clientSecret)
4141
.scope("profile") // replace with desired scope

scribejava-apis/src/test/java/com/github/scribejava/apis/examples/MailruAsyncExample.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import java.util.Scanner;
55
import java.util.concurrent.ExecutionException;
66
import com.github.scribejava.apis.MailruApi;
7-
import com.github.scribejava.core.builder.ServiceBuilderAsync;
7+
import com.github.scribejava.core.builder.ServiceBuilder;
88
import com.github.scribejava.core.model.OAuth2AccessToken;
99
import com.github.scribejava.core.model.OAuthRequestAsync;
1010
import com.github.scribejava.core.model.Response;
@@ -30,7 +30,7 @@ public static void main(String... args) throws InterruptedException, ExecutionEx
3030
.setReadTimeout(10_000)
3131
.build();
3232

33-
final OAuth20Service service = new ServiceBuilderAsync()
33+
final OAuth20Service service = new ServiceBuilder()
3434
.apiKey(clientId)
3535
.apiSecret(clientSecret)
3636
.callback("http://www.example.com/oauth_callback/")

scribejava-core/src/main/java/com/github/scribejava/core/builder/AbstractServiceBuilder.java

Lines changed: 0 additions & 185 deletions
This file was deleted.

0 commit comments

Comments
 (0)