Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit450977a

Browse files
committed
remove Consumer interface and its usages (thanks tohttps://github.com/CodingFabian)
1 parentcd20f57 commit450977a

File tree

3 files changed

+55
-138
lines changed
  • scribejava-core/src/main/java/com/github/scribejava/core/java8
  • scribejava-httpclient-ahc/src/main/java/com/github/scribejava/httpclient/ahc
  • scribejava-httpclient-ning/src/main/java/com/github/scribejava/httpclient/ning

3 files changed

+55
-138
lines changed

‎scribejava-core/src/main/java/com/github/scribejava/core/java8/Consumer.java

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

‎scribejava-httpclient-ahc/src/main/java/com/github/scribejava/httpclient/ahc/AhcHttpClient.java

Lines changed: 25 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
importcom.github.scribejava.core.httpclient.AbstractAsyncOnlyHttpClient;
44
importcom.github.scribejava.core.httpclient.multipart.MultipartPayload;
5-
importcom.github.scribejava.core.java8.Consumer;
65
importcom.github.scribejava.core.model.OAuthAsyncRequestCallback;
76
importcom.github.scribejava.core.model.OAuthConstants;
87
importcom.github.scribejava.core.model.OAuthRequest;
@@ -43,7 +42,7 @@ public void close() throws IOException {
4342
@Override
4443
public <T>Future<T>executeAsync(StringuserAgent,Map<String,String>headers,VerbhttpVerb,StringcompleteUrl,
4544
byte[]bodyContents,OAuthAsyncRequestCallback<T>callback,OAuthRequest.ResponseConverter<T>converter) {
46-
returndoExecuteAsync(userAgent,headers,httpVerb,completeUrl,newByteArrayConsumer(bodyContents),callback,
45+
returndoExecuteAsync(userAgent,headers,httpVerb,completeUrl,BodySetter.BYTE_ARRAY,bodyContents,callback,
4746
converter);
4847
}
4948

@@ -58,19 +57,19 @@ public <T> Future<T> executeAsync(String userAgent, Map<String, String> headers,
5857
@Override
5958
public <T>Future<T>executeAsync(StringuserAgent,Map<String,String>headers,VerbhttpVerb,StringcompleteUrl,
6059
StringbodyContents,OAuthAsyncRequestCallback<T>callback,OAuthRequest.ResponseConverter<T>converter) {
61-
returndoExecuteAsync(userAgent,headers,httpVerb,completeUrl,newStringConsumer(bodyContents),callback,
60+
returndoExecuteAsync(userAgent,headers,httpVerb,completeUrl,BodySetter.STRING,bodyContents,callback,
6261
converter);
6362
}
6463

6564
@Override
6665
public <T>Future<T>executeAsync(StringuserAgent,Map<String,String>headers,VerbhttpVerb,StringcompleteUrl,
6766
FilebodyContents,OAuthAsyncRequestCallback<T>callback,OAuthRequest.ResponseConverter<T>converter) {
68-
returndoExecuteAsync(userAgent,headers,httpVerb,completeUrl,newFileConsumer(bodyContents),callback,
67+
returndoExecuteAsync(userAgent,headers,httpVerb,completeUrl,BodySetter.FILE,bodyContents,callback,
6968
converter);
7069
}
7170

7271
private <T>Future<T>doExecuteAsync(StringuserAgent,Map<String,String>headers,VerbhttpVerb,
73-
StringcompleteUrl,Consumer<BoundRequestBuilder>bodySetter,OAuthAsyncRequestCallback<T>callback,
72+
StringcompleteUrl,BodySetterbodySetter,ObjectbodyContents,OAuthAsyncRequestCallback<T>callback,
7473
OAuthRequest.ResponseConverter<T>converter) {
7574
finalBoundRequestBuilderboundRequestBuilder;
7675
switch (httpVerb) {
@@ -94,7 +93,7 @@ private <T> Future<T> doExecuteAsync(String userAgent, Map<String, String> heade
9493
if (!headers.containsKey(CONTENT_TYPE)) {
9594
boundRequestBuilder.addHeader(CONTENT_TYPE,DEFAULT_CONTENT_TYPE);
9695
}
97-
bodySetter.accept(boundRequestBuilder);
96+
bodySetter.setBody(boundRequestBuilder,bodyContents);
9897
}
9998

10099
for (Map.Entry<String,String>header :headers.entrySet()) {
@@ -108,45 +107,26 @@ private <T> Future<T> doExecuteAsync(String userAgent, Map<String, String> heade
108107
returnboundRequestBuilder.execute(newOAuthAsyncCompletionHandler<>(callback,converter));
109108
}
110109

111-
privatestaticclassByteArrayConsumerimplementsConsumer<BoundRequestBuilder> {
112-
113-
privatefinalbyte[]bodyContents;
114-
115-
privateByteArrayConsumer(byte[]bodyContents) {
116-
this.bodyContents =bodyContents;
117-
}
118-
119-
@Override
120-
publicvoidaccept(BoundRequestBuilderrequestBuilder) {
121-
requestBuilder.setBody(bodyContents);
122-
}
123-
}
124-
125-
privatestaticclassStringConsumerimplementsConsumer<BoundRequestBuilder> {
126-
127-
privatefinalStringbodyContents;
128-
129-
privateStringConsumer(StringbodyContents) {
130-
this.bodyContents =bodyContents;
131-
}
132-
133-
@Override
134-
publicvoidaccept(BoundRequestBuilderrequestBuilder) {
135-
requestBuilder.setBody(bodyContents);
136-
}
137-
}
138-
139-
privatestaticclassFileConsumerimplementsConsumer<BoundRequestBuilder> {
140-
141-
privatefinalFilebodyContents;
142-
143-
privateFileConsumer(FilebodyContents) {
144-
this.bodyContents =bodyContents;
145-
}
110+
privateenumBodySetter {
111+
BYTE_ARRAY {
112+
@Override
113+
BoundRequestBuildersetBody(BoundRequestBuilderrequestBuilder,ObjectbodyContents) {
114+
returnrequestBuilder.setBody((byte[])bodyContents);
115+
}
116+
},
117+
STRING {
118+
@Override
119+
BoundRequestBuildersetBody(BoundRequestBuilderrequestBuilder,ObjectbodyContents) {
120+
returnrequestBuilder.setBody((String)bodyContents);
121+
}
122+
},
123+
FILE {
124+
@Override
125+
BoundRequestBuildersetBody(BoundRequestBuilderrequestBuilder,ObjectbodyContents) {
126+
returnrequestBuilder.setBody((File)bodyContents);
127+
}
128+
};
146129

147-
@Override
148-
publicvoidaccept(BoundRequestBuilderrequestBuilder) {
149-
requestBuilder.setBody(bodyContents);
150-
}
130+
abstractBoundRequestBuildersetBody(BoundRequestBuilderrequestBuilder,ObjectbodyContents);
151131
}
152132
}

‎scribejava-httpclient-ning/src/main/java/com/github/scribejava/httpclient/ning/NingHttpClient.java

Lines changed: 30 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
importcom.github.scribejava.core.httpclient.AbstractAsyncOnlyHttpClient;
44
importcom.github.scribejava.core.httpclient.multipart.MultipartPayload;
5-
importcom.github.scribejava.core.java8.Consumer;
65
importcom.github.scribejava.core.model.OAuthAsyncRequestCallback;
76
importcom.github.scribejava.core.model.OAuthConstants;
87
importcom.github.scribejava.core.model.OAuthRequest;
@@ -50,7 +49,7 @@ public <T> Future<T> executeAsync(String userAgent, Map<String, String> headers,
5049
finalbyte[]bodyContents,OAuthAsyncRequestCallback<T>callback,
5150
OAuthRequest.ResponseConverter<T>converter) {
5251

53-
returndoExecuteAsync(userAgent,headers,httpVerb,completeUrl,newByteArrayConsumer(bodyContents),callback,
52+
returndoExecuteAsync(userAgent,headers,httpVerb,completeUrl,BodySetter.BYTE_ARRAY,bodyContents,callback,
5453
converter);
5554
}
5655

@@ -67,7 +66,7 @@ public <T> Future<T> executeAsync(String userAgent, Map<String, String> headers,
6766
finalStringbodyContents,OAuthAsyncRequestCallback<T>callback,
6867
OAuthRequest.ResponseConverter<T>converter) {
6968

70-
returndoExecuteAsync(userAgent,headers,httpVerb,completeUrl,newStringConsumer(bodyContents),callback,
69+
returndoExecuteAsync(userAgent,headers,httpVerb,completeUrl,BodySetter.STRING,bodyContents,callback,
7170
converter);
7271
}
7372

@@ -76,13 +75,13 @@ public <T> Future<T> executeAsync(String userAgent, Map<String, String> headers,
7675
finalFilebodyContents,OAuthAsyncRequestCallback<T>callback,
7776
OAuthRequest.ResponseConverter<T>converter) {
7877

79-
returndoExecuteAsync(userAgent,headers,httpVerb,completeUrl,newFileConsumer(bodyContents),callback,
78+
returndoExecuteAsync(userAgent,headers,httpVerb,completeUrl,BodySetter.FILE,bodyContents,callback,
8079
converter);
8180
}
8281

8382
private <T>Future<T>doExecuteAsync(StringuserAgent,Map<String,String>headers,VerbhttpVerb,
84-
StringcompleteUrl,Consumer<AsyncHttpClient.BoundRequestBuilder>bodySetter,
85-
OAuthAsyncRequestCallback<T>callback,OAuthRequest.ResponseConverter<T>converter) {
83+
StringcompleteUrl,BodySetterbodySetter,ObjectbodyContents,OAuthAsyncRequestCallback<T>callback,
84+
OAuthRequest.ResponseConverter<T>converter) {
8685
finalAsyncHttpClient.BoundRequestBuilderboundRequestBuilder;
8786
switch (httpVerb) {
8887
caseGET:
@@ -105,7 +104,7 @@ private <T> Future<T> doExecuteAsync(String userAgent, Map<String, String> heade
105104
if (!headers.containsKey(CONTENT_TYPE)) {
106105
boundRequestBuilder.addHeader(CONTENT_TYPE,DEFAULT_CONTENT_TYPE);
107106
}
108-
bodySetter.accept(boundRequestBuilder);
107+
bodySetter.setBody(boundRequestBuilder,bodyContents);
109108
}
110109

111110
for (Map.Entry<String,String>header :headers.entrySet()) {
@@ -119,45 +118,30 @@ private <T> Future<T> doExecuteAsync(String userAgent, Map<String, String> heade
119118
returnboundRequestBuilder.execute(newOAuthAsyncCompletionHandler<>(callback,converter));
120119
}
121120

122-
privatestaticclassByteArrayConsumerimplementsConsumer<AsyncHttpClient.BoundRequestBuilder> {
123-
124-
privatefinalbyte[]bodyContents;
125-
126-
privateByteArrayConsumer(byte[]bodyContents) {
127-
this.bodyContents =bodyContents;
128-
}
129-
130-
@Override
131-
publicvoidaccept(AsyncHttpClient.BoundRequestBuilderrequestBuilder) {
132-
requestBuilder.setBody(bodyContents);
133-
}
134-
}
135-
136-
privatestaticclassStringConsumerimplementsConsumer<AsyncHttpClient.BoundRequestBuilder> {
137-
138-
privatefinalStringbodyContents;
139-
140-
privateStringConsumer(StringbodyContents) {
141-
this.bodyContents =bodyContents;
142-
}
143-
144-
@Override
145-
publicvoidaccept(AsyncHttpClient.BoundRequestBuilderrequestBuilder) {
146-
requestBuilder.setBody(bodyContents);
147-
}
148-
}
149-
150-
privatestaticclassFileConsumerimplementsConsumer<AsyncHttpClient.BoundRequestBuilder> {
151-
152-
privatefinalFilebodyContents;
153-
154-
privateFileConsumer(FilebodyContents) {
155-
this.bodyContents =bodyContents;
156-
}
121+
privateenumBodySetter {
122+
BYTE_ARRAY {
123+
@Override
124+
AsyncHttpClient.BoundRequestBuildersetBody(AsyncHttpClient.BoundRequestBuilderrequestBuilder,
125+
ObjectbodyContents) {
126+
returnrequestBuilder.setBody((byte[])bodyContents);
127+
}
128+
},
129+
STRING {
130+
@Override
131+
AsyncHttpClient.BoundRequestBuildersetBody(AsyncHttpClient.BoundRequestBuilderrequestBuilder,
132+
ObjectbodyContents) {
133+
returnrequestBuilder.setBody((String)bodyContents);
134+
}
135+
},
136+
FILE {
137+
@Override
138+
AsyncHttpClient.BoundRequestBuildersetBody(AsyncHttpClient.BoundRequestBuilderrequestBuilder,
139+
ObjectbodyContents) {
140+
returnrequestBuilder.setBody((File)bodyContents);
141+
}
142+
};
157143

158-
@Override
159-
publicvoidaccept(AsyncHttpClient.BoundRequestBuilderrequestBuilder) {
160-
requestBuilder.setBody(bodyContents);
161-
}
144+
abstractAsyncHttpClient.BoundRequestBuildersetBody(AsyncHttpClient.BoundRequestBuilderrequestBuilder,
145+
ObjectbodyContents);
162146
}
163147
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp