Skip to content

Commit 73c2ef4

Browse files
kullfarkullfar
committed
remove deprecated code
1 parent 4f14bdb commit 73c2ef4

File tree

10 files changed

+1
-220
lines changed

10 files changed

+1
-220
lines changed

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

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,10 @@
11
package com.github.scribejava.apis;
22

33
import com.github.scribejava.apis.microsoftazureactivedirectory.MicrosoftAzureActiveDirectoryBearerSignature;
4-
import com.github.scribejava.apis.service.MicrosoftAzureActiveDirectoryService;
54
import com.github.scribejava.core.builder.api.DefaultApi20;
6-
import com.github.scribejava.core.httpclient.HttpClient;
7-
import com.github.scribejava.core.httpclient.HttpClientConfig;
85
import com.github.scribejava.core.oauth2.bearersignature.BearerSignature;
96
import com.github.scribejava.core.oauth2.clientauthentication.ClientAuthentication;
107
import com.github.scribejava.core.oauth2.clientauthentication.RequestBodyAuthenticationScheme;
11-
import java.io.OutputStream;
128

139
/**
1410
* Microsoft Azure Active Directory Api
@@ -51,18 +47,6 @@ protected String getAuthorizationBaseUrl() {
5147
return MSFT_LOGIN_URL + SLASH + COMMON + SLASH + AUTH_URI;
5248
}
5349

54-
/**
55-
* @deprecated moved to {@link #getBearerSignature() }
56-
*/
57-
@Deprecated
58-
@Override
59-
public MicrosoftAzureActiveDirectoryService createService(String apiKey, String apiSecret, String callback,
60-
String scope, OutputStream debugStream, String state, String responseType, String userAgent,
61-
HttpClientConfig httpClientConfig, HttpClient httpClient) {
62-
return new MicrosoftAzureActiveDirectoryService(this, apiKey, apiSecret, callback, scope, state, responseType,
63-
userAgent, httpClientConfig, httpClient);
64-
}
65-
6650
@Override
6751
public ClientAuthentication getClientAuthentication() {
6852
return RequestBodyAuthenticationScheme.instance();

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

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
11
package com.github.scribejava.apis;
22

3-
import com.github.scribejava.apis.service.TutByOAuthService;
43
import com.github.scribejava.apis.tutby.TutByBearerSignature;
54
import com.github.scribejava.core.builder.api.DefaultApi20;
6-
import com.github.scribejava.core.httpclient.HttpClient;
7-
import com.github.scribejava.core.httpclient.HttpClientConfig;
85
import com.github.scribejava.core.oauth2.bearersignature.BearerSignature;
9-
import java.io.OutputStream;
106

117
public class TutByApi extends DefaultApi20 {
128

@@ -31,18 +27,6 @@ protected String getAuthorizationBaseUrl() {
3127
return "http://profile.tut.by/auth";
3228
}
3329

34-
/**
35-
* @deprecated moved to {@link #getBearerSignature() }
36-
*/
37-
@Deprecated
38-
@Override
39-
public TutByOAuthService createService(String apiKey, String apiSecret, String callback, String scope,
40-
OutputStream debugStream, String state, String responseType, String userAgent,
41-
HttpClientConfig httpClientConfig, HttpClient httpClient) {
42-
return new TutByOAuthService(this, apiKey, apiSecret, callback, scope, state, responseType, userAgent,
43-
httpClientConfig, httpClient);
44-
}
45-
4630
@Override
4731
public BearerSignature getBearerSignature() {
4832
return TutByBearerSignature.instance();

‎scribejava-apis/src/main/java/com/github/scribejava/apis/service/FacebookService.java‎

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

‎scribejava-apis/src/main/java/com/github/scribejava/apis/service/ImgurOAuthService.java‎

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

‎scribejava-apis/src/main/java/com/github/scribejava/apis/service/MailruOAuthService.java‎

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

‎scribejava-apis/src/main/java/com/github/scribejava/apis/service/MicrosoftAzureActiveDirectoryService.java‎

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

‎scribejava-apis/src/main/java/com/github/scribejava/apis/service/OdnoklassnikiOAuthService.java‎

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

‎scribejava-apis/src/main/java/com/github/scribejava/apis/service/TutByOAuthService.java‎

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

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

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import com.github.scribejava.core.oauth.OAuth20Service;
1212
import com.github.scribejava.core.oauth2.bearersignature.BearerSignature;
1313
import com.github.scribejava.core.oauth2.bearersignature.BearerSignatureAuthorizationRequestHeaderField;
14-
import com.github.scribejava.core.oauth2.bearersignature.BearerSignatureURIQueryParameter;
1514
import com.github.scribejava.core.oauth2.clientauthentication.ClientAuthentication;
1615
import com.github.scribejava.core.oauth2.clientauthentication.HttpBasicAuthenticationScheme;
1716
import java.io.OutputStream;
@@ -115,24 +114,8 @@ public OAuth20Service createService(String apiKey, String apiSecret, String call
115114
httpClientConfig, httpClient);
116115
}
117116

118-
/**
119-
* @return OAuth2SignatureType
120-
* @deprecated use {@link #getBearerSignature() }
121-
*/
122-
@Deprecated
123-
public OAuth2SignatureType getSignatureType() {
124-
return OAuth2SignatureType.BEARER_AUTHORIZATION_REQUEST_HEADER_FIELD;
125-
}
126-
127117
public BearerSignature getBearerSignature() {
128-
switch (getSignatureType()) {
129-
case BEARER_AUTHORIZATION_REQUEST_HEADER_FIELD:
130-
return BearerSignatureAuthorizationRequestHeaderField.instance();
131-
case BEARER_URI_QUERY_PARAMETER:
132-
return BearerSignatureURIQueryParameter.instance();
133-
default:
134-
throw new IllegalStateException("unknown OAuth2SignatureType");
135-
}
118+
return BearerSignatureAuthorizationRequestHeaderField.instance();
136119
}
137120

138121
public ClientAuthentication getClientAuthentication() {

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

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

0 commit comments

Comments
 (0)