GeezerVison is showing github.com — cleanup deprecates methods · scribejava/scribejava@c3c19f2
File tree
Expand file treeCollapse file tree
Open diff view settings
scribejava-core/src/main/java/com/github/scribejava/core
Expand file treeCollapse file tree
Open diff view settings
Collapse file
Copy file name to clipboardExpand all lines: changelog +3Lines changed: 3 additions & 0 deletions | Original file line number | Diff line number | Diff line change |
|---|
|
| 1 | +[SNAPSHOT] |
| 2 | + * cleanup deprecates methods |
| 3 | + |
1 | 4 | [6.5.0] |
2 | 5 | * separate OAuth1.0a and OAuth2.0 ServiceBuilders, |
3 | 6 | introduce AuthorizationUrlBuilder (along with deprecation of AuthorizationUrlWithPKCE) |
|
Collapse file
Copy file name to clipboardExpand all lines: scribejava-core/src/main/java/com/github/scribejava/core/builder/ServiceBuilder.java +3-9Lines changed: 3 additions & 9 deletions | Original file line number | Diff line number | Diff line change |
|---|
@@ -51,26 +51,20 @@ public ServiceBuilder apiSecret(String apiSecret) { |
51 | 51 | return this; |
52 | 52 | } |
53 | 53 |
|
54 | | - /** |
55 | | - * @deprecated use {@link ServiceBuilderOAuth20#defaultScope(java.lang.String)} or |
56 | | - * {@link ServiceBuilderOAuth10a#withScope(java.lang.String)} |
57 | | - */ |
58 | | - @Override |
59 | | - @Deprecated |
60 | | - public ServiceBuilder scope(String scope) { |
| 54 | + private ServiceBuilder setScope(String scope) { |
61 | 55 | Preconditions.checkEmptyString(scope, "Invalid OAuth scope"); |
62 | 56 | this.scope = scope; |
63 | 57 | return this; |
64 | 58 | } |
65 | 59 |
|
66 | 60 | @Override |
67 | 61 | public ServiceBuilderOAuth20 defaultScope(String defaultScope) { |
68 | | - return scope(defaultScope); |
| 62 | + return setScope(defaultScope); |
69 | 63 | } |
70 | 64 |
|
71 | 65 | @Override |
72 | 66 | public ServiceBuilderOAuth10a withScope(String scope) { |
73 | | - return scope(scope); |
| 67 | + return setScope(scope); |
74 | 68 | } |
75 | 69 |
|
76 | 70 | @Override |
|
Collapse file
Copy file name to clipboardExpand all lines: scribejava-core/src/main/java/com/github/scribejava/core/builder/ServiceBuilderCommon.java -11Lines changed: 0 additions & 11 deletions | Original file line number | Diff line number | Diff line change |
|---|
@@ -34,17 +34,6 @@ public interface ServiceBuilderCommon { |
34 | 34 | */ |
35 | 35 | ServiceBuilderCommon apiSecret(String apiSecret); |
36 | 36 |
|
37 | | - /** |
38 | | - * Configures the OAuth scope. This is only necessary in some APIs (like Google's). |
39 | | - * |
40 | | - * @param scope The OAuth scope |
41 | | - * @return the {@link ServiceBuilder} instance for method chaining |
42 | | - * @deprecated use {@link ServiceBuilderOAuth20#defaultScope(java.lang.String)} or |
43 | | - * {@link ServiceBuilderOAuth10a#withScope(java.lang.String)} |
44 | | - */ |
45 | | - @Deprecated |
46 | | - ServiceBuilderCommon scope(String scope); |
47 | | - |
48 | 37 | ServiceBuilderCommon httpClientConfig(HttpClientConfig httpClientConfig); |
49 | 38 |
|
50 | 39 | /** |
|
Collapse file
Copy file name to clipboardExpand all lines: scribejava-core/src/main/java/com/github/scribejava/core/builder/ServiceBuilderOAuth10a.java -7Lines changed: 0 additions & 7 deletions | Original file line number | Diff line number | Diff line change |
|---|
@@ -17,13 +17,6 @@ public interface ServiceBuilderOAuth10a extends ServiceBuilderCommon { |
17 | 17 | @Override |
18 | 18 | ServiceBuilderOAuth20 apiSecret(String apiSecret); |
19 | 19 |
|
20 | | - /** |
21 | | - * @deprecated use {@link #withScope(java.lang.String) } |
22 | | - */ |
23 | | - @Override |
24 | | - @Deprecated |
25 | | - ServiceBuilderOAuth20 scope(String scope); |
26 | | - |
27 | 20 | @Override |
28 | 21 | ServiceBuilderOAuth20 httpClientConfig(HttpClientConfig httpClientConfig); |
29 | 22 |
|
|
Collapse file
Copy file name to clipboardExpand all lines: scribejava-core/src/main/java/com/github/scribejava/core/builder/ServiceBuilderOAuth20.java -7Lines changed: 0 additions & 7 deletions | Original file line number | Diff line number | Diff line change |
|---|
@@ -16,13 +16,6 @@ public interface ServiceBuilderOAuth20 extends ServiceBuilderCommon { |
16 | 16 | @Override |
17 | 17 | ServiceBuilderOAuth20 apiSecret(String apiSecret); |
18 | 18 |
|
19 | | - /** |
20 | | - * @deprecated use {@link #defaultScope(java.lang.String) } |
21 | | - */ |
22 | | - @Override |
23 | | - @Deprecated |
24 | | - ServiceBuilderOAuth20 scope(String scope); |
25 | | - |
26 | 19 | @Override |
27 | 20 | ServiceBuilderOAuth20 httpClientConfig(HttpClientConfig httpClientConfig); |
28 | 21 |
|
|