Skip to content

Commit bec29fd

Browse files
kullfarkullfar
committed
drop deprecates + add note to changelog about bask of java7 support
1 parent befc684 commit bec29fd

File tree

12 files changed

+3
-281
lines changed

12 files changed

+3
-281
lines changed

‎changelog‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
* fix LinkedInApi20 (thanks to https://github.com/jhorowitz-firedrum)
6969

7070
[5.0.0]
71-
* drop Java 7 backward compatibility support, become Java 8 only
71+
* drop Java 7 backward compatibility support, become Java 8 only (was reverted in v5.2.0-java7again)
7272
* add JSON token extractor for OAuth 1.0a (thanks to https://github.com/evstropovv)
7373
* add new API - uCoz (https://www.ucoz.com/) (thanks to https://github.com/evstropovv)
7474
* add PKCE (RFC 7636) support (Proof Key for Code Exchange by OAuth Public Clients) (thanks for suggesting to https://github.com/dieseldjango)

‎scribejava-apis/src/main/java/com/github/scribejava/apis/FacebookApi.java‎

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import com.github.scribejava.core.model.Verb;
1111
import com.github.scribejava.core.oauth2.clientauthentication.ClientAuthentication;
1212
import com.github.scribejava.core.oauth2.clientauthentication.RequestBodyAuthenticationScheme;
13-
import java.io.OutputStream;
1413

1514
/**
1615
* Facebook API
@@ -70,31 +69,6 @@ public ClientAuthentication getClientAuthentication() {
7069
return RequestBodyAuthenticationScheme.instance();
7170
}
7271

73-
/**
74-
*
75-
* @param apiKey apiKey
76-
* @param apiSecret apiSecret
77-
* @param callback callback
78-
* @param defaultScope defaultScope
79-
* @param debugStream debugStream
80-
* @param responseType responseType
81-
* @param userAgent userAgent
82-
* @param httpClientConfig httpClientConfig
83-
* @param httpClient httpClient
84-
* @return service
85-
* @deprecated use {@link #createService(java.lang.String, java.lang.String, java.lang.String, java.lang.String,
86-
* java.lang.String, java.lang.String, com.github.scribejava.core.httpclient.HttpClientConfig,
87-
* com.github.scribejava.core.httpclient.HttpClient) }
88-
*/
89-
@Deprecated
90-
@Override
91-
public FacebookService createService(String apiKey, String apiSecret, String callback, String defaultScope,
92-
OutputStream debugStream, String responseType, String userAgent, HttpClientConfig httpClientConfig,
93-
HttpClient httpClient) {
94-
return createService(apiKey, apiSecret, callback, defaultScope, responseType, userAgent, httpClientConfig,
95-
httpClient);
96-
}
97-
9872
@Override
9973
public FacebookService createService(String apiKey, String apiSecret, String callback, String defaultScope,
10074
String responseType, String userAgent, HttpClientConfig httpClientConfig, HttpClient httpClient) {

‎scribejava-apis/src/main/java/com/github/scribejava/apis/ImgurApi.java‎

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import com.github.scribejava.core.httpclient.HttpClientConfig;
77
import com.github.scribejava.core.model.OAuthConstants;
88
import com.github.scribejava.core.model.ParameterList;
9-
import java.io.OutputStream;
109
import java.util.Map;
1110

1211
public class ImgurApi extends DefaultApi20 {
@@ -54,31 +53,6 @@ protected String getAuthorizationBaseUrl() {
5453
throw new UnsupportedOperationException("use getAuthorizationUrl instead");
5554
}
5655

57-
/**
58-
*
59-
* @param apiKey apiKey
60-
* @param apiSecret apiSecret
61-
* @param callback callback
62-
* @param defaultScope defaultScope
63-
* @param debugStream debugStream
64-
* @param responseType responseType
65-
* @param userAgent userAgent
66-
* @param httpClientConfig httpClientConfig
67-
* @param httpClient httpClient
68-
* @return service
69-
* @deprecated use {@link #createService(java.lang.String, java.lang.String, java.lang.String, java.lang.String,
70-
* java.lang.String, java.lang.String, com.github.scribejava.core.httpclient.HttpClientConfig,
71-
* com.github.scribejava.core.httpclient.HttpClient) }
72-
*/
73-
@Deprecated
74-
@Override
75-
public ImgurOAuthService createService(String apiKey, String apiSecret, String callback, String defaultScope,
76-
OutputStream debugStream, String responseType, String userAgent, HttpClientConfig httpClientConfig,
77-
HttpClient httpClient) {
78-
return createService(apiKey, apiSecret, callback, defaultScope, responseType, userAgent, httpClientConfig,
79-
httpClient);
80-
}
81-
8256
@Override
8357
public ImgurOAuthService createService(String apiKey, String apiSecret, String callback, String defaultScope,
8458
String responseType, String userAgent, HttpClientConfig httpClientConfig, HttpClient httpClient) {

‎scribejava-apis/src/main/java/com/github/scribejava/apis/MailruApi.java‎

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import com.github.scribejava.core.builder.api.DefaultApi20;
55
import com.github.scribejava.core.httpclient.HttpClient;
66
import com.github.scribejava.core.httpclient.HttpClientConfig;
7-
import java.io.OutputStream;
87

98
public class MailruApi extends DefaultApi20 {
109

@@ -29,31 +28,6 @@ protected String getAuthorizationBaseUrl() {
2928
return "https://connect.mail.ru/oauth/authorize";
3029
}
3130

32-
/**
33-
*
34-
* @param apiKey apiKey
35-
* @param apiSecret apiSecret
36-
* @param callback callback
37-
* @param defaultScope defaultScope
38-
* @param debugStream debugStream
39-
* @param responseType responseType
40-
* @param userAgent userAgent
41-
* @param httpClientConfig httpClientConfig
42-
* @param httpClient httpClient
43-
* @return service
44-
* @deprecated use {@link #createService(java.lang.String, java.lang.String, java.lang.String, java.lang.String,
45-
* java.lang.String, java.lang.String, com.github.scribejava.core.httpclient.HttpClientConfig,
46-
* com.github.scribejava.core.httpclient.HttpClient) }
47-
*/
48-
@Deprecated
49-
@Override
50-
public MailruOAuthService createService(String apiKey, String apiSecret, String callback, String defaultScope,
51-
OutputStream debugStream, String responseType, String userAgent, HttpClientConfig httpClientConfig,
52-
HttpClient httpClient) {
53-
return createService(apiKey, apiSecret, callback, defaultScope, responseType, userAgent, httpClientConfig,
54-
httpClient);
55-
}
56-
5731
@Override
5832
public MailruOAuthService createService(String apiKey, String apiSecret, String callback, String defaultScope,
5933
String responseType, String userAgent, HttpClientConfig httpClientConfig, HttpClient httpClient) {

‎scribejava-apis/src/main/java/com/github/scribejava/apis/OdnoklassnikiApi.java‎

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import com.github.scribejava.core.oauth2.bearersignature.BearerSignatureURIQueryParameter;
99
import com.github.scribejava.core.oauth2.clientauthentication.ClientAuthentication;
1010
import com.github.scribejava.core.oauth2.clientauthentication.RequestBodyAuthenticationScheme;
11-
import java.io.OutputStream;
1211

1312
public class OdnoklassnikiApi extends DefaultApi20 {
1413

@@ -33,31 +32,6 @@ protected String getAuthorizationBaseUrl() {
3332
return "https://connect.ok.ru/oauth/authorize";
3433
}
3534

36-
/**
37-
*
38-
* @param apiKey apiKey
39-
* @param apiSecret apiSecret
40-
* @param callback callback
41-
* @param defaultScope defaultScope
42-
* @param debugStream debugStream
43-
* @param responseType responseType
44-
* @param userAgent userAgent
45-
* @param httpClientConfig httpClientConfig
46-
* @param httpClient httpClient
47-
* @return service
48-
* @deprecated use {@link #createService(java.lang.String, java.lang.String, java.lang.String, java.lang.String,
49-
* java.lang.String, java.lang.String, com.github.scribejava.core.httpclient.HttpClientConfig,
50-
* com.github.scribejava.core.httpclient.HttpClient) }
51-
*/
52-
@Deprecated
53-
@Override
54-
public OdnoklassnikiOAuthService createService(String apiKey, String apiSecret, String callback,
55-
String defaultScope, OutputStream debugStream, String responseType, String userAgent,
56-
HttpClientConfig httpClientConfig, HttpClient httpClient) {
57-
return createService(apiKey, apiSecret, callback, defaultScope, responseType, userAgent, httpClientConfig,
58-
httpClient);
59-
}
60-
6135
@Override
6236
public OdnoklassnikiOAuthService createService(String apiKey, String apiSecret, String callback,
6337
String defaultScope, String responseType, String userAgent, HttpClientConfig httpClientConfig,

‎scribejava-apis/src/main/java/com/github/scribejava/apis/WunderlistAPI.java‎

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import com.github.scribejava.core.oauth2.bearersignature.BearerSignatureURIQueryParameter;
1010
import com.github.scribejava.core.oauth2.clientauthentication.ClientAuthentication;
1111
import com.github.scribejava.core.oauth2.clientauthentication.RequestBodyAuthenticationScheme;
12-
import java.io.OutputStream;
1312

1413
/**
1514
* Wunderlist.com Api
@@ -48,31 +47,6 @@ public ClientAuthentication getClientAuthentication() {
4847
return RequestBodyAuthenticationScheme.instance();
4948
}
5049

51-
/**
52-
*
53-
* @param apiKey apiKey
54-
* @param apiSecret apiSecret
55-
* @param callback callback
56-
* @param defaultScope defaultScope
57-
* @param debugStream debugStream
58-
* @param responseType responseType
59-
* @param userAgent userAgent
60-
* @param httpClientConfig httpClientConfig
61-
* @param httpClient httpClient
62-
* @return service
63-
* @deprecated use {@link #createService(java.lang.String, java.lang.String, java.lang.String, java.lang.String,
64-
* java.lang.String, java.lang.String, com.github.scribejava.core.httpclient.HttpClientConfig,
65-
* com.github.scribejava.core.httpclient.HttpClient) }
66-
*/
67-
@Deprecated
68-
@Override
69-
public OAuth20Service createService(String apiKey, String apiSecret, String callback, String defaultScope,
70-
OutputStream debugStream, String responseType, String userAgent, HttpClientConfig httpClientConfig,
71-
HttpClient httpClient) {
72-
return createService(apiKey, apiSecret, callback, defaultScope, responseType, userAgent, httpClientConfig,
73-
httpClient);
74-
}
75-
7650
@Override
7751
public OAuth20Service createService(String apiKey, String apiSecret, String callback, String defaultScope,
7852
String responseType, String userAgent, HttpClientConfig httpClientConfig, HttpClient httpClient) {

‎scribejava-core/src/main/java/com/github/scribejava/core/builder/ServiceBuilder.java‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.github.scribejava.core.builder;
22

3-
import com.github.scribejava.core.builder.api.BaseApi;
43
import com.github.scribejava.core.builder.api.DefaultApi10a;
54
import com.github.scribejava.core.builder.api.DefaultApi20;
65
import com.github.scribejava.core.httpclient.HttpClient;
@@ -119,21 +118,6 @@ public ServiceBuilder debug() {
119118
return this;
120119
}
121120

122-
/**
123-
* Returns the fully configured {@link OAuthService}
124-
*
125-
* @param <S> OAuthService implementation (OAuth1/OAuth2/any API specific)
126-
* @param api will build Service for this API
127-
* @return fully configured {@link OAuthService}
128-
* @deprecated use {@link #build(com.github.scribejava.core.builder.api.DefaultApi10a) }
129-
* or {@link #build(com.github.scribejava.core.builder.api.DefaultApi20)}
130-
*/
131-
@Deprecated
132-
public <S extends OAuthService> S build(BaseApi<S> api) {
133-
return api.createService(apiKey, apiSecret, callback, scope, debugStream, responseType, userAgent,
134-
httpClientConfig, httpClient);
135-
}
136-
137121
public OAuth10aService build(DefaultApi10a api) {
138122
return api.createService(apiKey, apiSecret, callback, scope, debugStream, userAgent, httpClientConfig,
139123
httpClient);

‎scribejava-core/src/main/java/com/github/scribejava/core/builder/api/BaseApi.java‎

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

‎scribejava-core/src/main/java/com/github/scribejava/core/builder/api/DefaultApi10a.java‎

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
* fine-tune the process. Please read the javadocs of the interfaces to get an idea of what to do.
3535
*
3636
*/
37-
public abstract class DefaultApi10a implements BaseApi<OAuth10aService> {
37+
public abstract class DefaultApi10a {
3838

3939
/**
4040
* Returns the access token extractor.
@@ -143,30 +143,6 @@ public String getAuthorizationUrl(OAuth1RequestToken requestToken) {
143143
return parameters.appendTo(getAuthorizationBaseUrl());
144144
}
145145

146-
/**
147-
*
148-
* @param apiKey apiKey
149-
* @param apiSecret apiSecret
150-
* @param callback callback
151-
* @param scope scope
152-
* @param debugStream debugStream
153-
* @param responseType responseType
154-
* @param userAgent userAgent
155-
* @param httpClientConfig httpClientConfig
156-
* @param httpClient httpClient
157-
* @return service
158-
* @deprecated use {@link #createService(java.lang.String, java.lang.String, java.lang.String, java.lang.String,
159-
* java.io.OutputStream, java.lang.String, com.github.scribejava.core.httpclient.HttpClientConfig,
160-
* com.github.scribejava.core.httpclient.HttpClient)}
161-
*/
162-
@Deprecated
163-
@Override
164-
public OAuth10aService createService(String apiKey, String apiSecret, String callback, String scope,
165-
OutputStream debugStream, String responseType, String userAgent, HttpClientConfig httpClientConfig,
166-
HttpClient httpClient) {
167-
return createService(apiKey, apiSecret, callback, scope, debugStream, userAgent, httpClientConfig, httpClient);
168-
}
169-
170146
public OAuth10aService createService(String apiKey, String apiSecret, String callback, String scope,
171147
OutputStream debugStream, String userAgent, HttpClientConfig httpClientConfig, HttpClient httpClient) {
172148
return new OAuth10aService(this, apiKey, apiSecret, callback, scope, debugStream, userAgent, httpClientConfig,

‎scribejava-core/src/main/java/com/github/scribejava/core/builder/api/DefaultApi20.java‎

Lines changed: 1 addition & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
import com.github.scribejava.core.oauth2.bearersignature.BearerSignatureAuthorizationRequestHeaderField;
1414
import com.github.scribejava.core.oauth2.clientauthentication.ClientAuthentication;
1515
import com.github.scribejava.core.oauth2.clientauthentication.HttpBasicAuthenticationScheme;
16-
import java.io.OutputStream;
1716
import java.util.Map;
1817

1918
/**
@@ -29,7 +28,7 @@
2928
* fine-tune the process. Please read the javadocs of the interfaces to get an idea of what to do.
3029
*
3130
*/
32-
public abstract class DefaultApi20 implements BaseApi<OAuth20Service> {
31+
public abstract class DefaultApi20 {
3332

3433
/**
3534
* Returns the access token extractor.
@@ -106,31 +105,6 @@ public String getAuthorizationUrl(String responseType, String apiKey, String cal
106105
return parameters.appendTo(getAuthorizationBaseUrl());
107106
}
108107

109-
/**
110-
*
111-
* @param apiKey apiKey
112-
* @param apiSecret apiSecret
113-
* @param callback callback
114-
* @param defaultScope defaultScope
115-
* @param debugStream debugStream
116-
* @param responseType responseType
117-
* @param userAgent userAgent
118-
* @param httpClientConfig httpClientConfig
119-
* @param httpClient httpClient
120-
* @return service
121-
* @deprecated use {@link #createService(java.lang.String, java.lang.String, java.lang.String, java.lang.String,
122-
* java.lang.String, java.lang.String, com.github.scribejava.core.httpclient.HttpClientConfig,
123-
* com.github.scribejava.core.httpclient.HttpClient) }
124-
*/
125-
@Deprecated
126-
@Override
127-
public OAuth20Service createService(String apiKey, String apiSecret, String callback, String defaultScope,
128-
OutputStream debugStream, String responseType, String userAgent, HttpClientConfig httpClientConfig,
129-
HttpClient httpClient) {
130-
return createService(apiKey, apiSecret, callback, defaultScope, responseType, userAgent, httpClientConfig,
131-
httpClient);
132-
}
133-
134108
public OAuth20Service createService(String apiKey, String apiSecret, String callback, String defaultScope,
135109
String responseType, String userAgent, HttpClientConfig httpClientConfig, HttpClient httpClient) {
136110
return new OAuth20Service(this, apiKey, apiSecret, callback, defaultScope, responseType, userAgent,

0 commit comments

Comments
 (0)