Skip to content

Commit cd4888e

Browse files
committed
Updated to be able to merge into master.
1 parent d4314ad commit cd4888e

1 file changed

Lines changed: 13 additions & 5 deletions

File tree

‎scribejava-core/src/main/java/com/github/scribejava/core/extractors/BaseStringExtractorImpl.java‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,28 +14,36 @@
1414
*/
1515
public class BaseStringExtractorImpl implements BaseStringExtractor {
1616

17-
private static final String AMPERSAND_SEPARATED_STRING = "%s&%s&%s";
17+
protected static final String AMPERSAND_SEPARATED_STRING = "%s&%s&%s";
1818

1919
/**
2020
* {@inheritDoc}
2121
*/
2222
public String extract(AbstractRequest request) {
2323
checkPreconditions(request);
24-
String verb = OAuthEncoder.encode(request.getVerb().name());
25-
String url = OAuthEncoder.encode(request.getSanitizedUrl());
24+
String verb = OAuthEncoder.encode(getVerb(request));
25+
String url = OAuthEncoder.encode(getUrl(request));
2626
String params = getSortedAndEncodedParams(request);
2727
return String.format(AMPERSAND_SEPARATED_STRING, verb, url, params);
2828
}
2929

30-
private String getSortedAndEncodedParams(AbstractRequest request) {
30+
protected String getVerb(AbstractRequest request) {
31+
return request.getVerb().name();
32+
}
33+
34+
protected String getUrl(AbstractRequest request) {
35+
return request.getSanitizedUrl();
36+
}
37+
38+
protected String getSortedAndEncodedParams(AbstractRequest request) {
3139
ParameterList params = new ParameterList();
3240
params.addAll(request.getQueryStringParams());
3341
params.addAll(request.getBodyParams());
3442
params.addAll(new ParameterList(request.getOauthParameters()));
3543
return params.sort().asOauthBaseString();
3644
}
3745

38-
private void checkPreconditions(AbstractRequest request) {
46+
protected void checkPreconditions(AbstractRequest request) {
3947
Preconditions.checkNotNull(request, "Cannot extract base string from a null object");
4048

4149
if (request.getOauthParameters() == null || request.getOauthParameters().size() <= 0) {

0 commit comments

Comments
 (0)