Skip to content

Commit 5fd620d

Browse files
authored
vararg interceptors (#203)
1 parent 11d24f8 commit 5fd620d

File tree

4 files changed

+19
-16
lines changed

4 files changed

+19
-16
lines changed

http-client/src/main/java/io/avaje/http/client/DHttpClientBuilder.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import java.net.CookieHandler;
99
import java.net.ProxySelector;
1010
import java.time.Duration;
11+
import java.util.Collections;
1112
import java.util.concurrent.Executor;
1213

1314
final class DHttpClientBuilder extends DBaseBuilder implements HttpClient.Builder, HttpClient.Builder.State {
@@ -58,14 +59,14 @@ public HttpClient.Builder requestLogging(boolean requestLogging) {
5859
}
5960

6061
@Override
61-
public HttpClient.Builder requestListener(RequestListener requestListener) {
62-
this.listeners.add(requestListener);
62+
public HttpClient.Builder requestListener(RequestListener... requestListener) {
63+
Collections.addAll(listeners, requestListener);
6364
return this;
6465
}
6566

6667
@Override
67-
public HttpClient.Builder requestIntercept(RequestIntercept requestIntercept) {
68-
this.interceptors.add(requestIntercept);
68+
public HttpClient.Builder requestIntercept(RequestIntercept... requestIntercept) {
69+
Collections.addAll(interceptors, requestIntercept);
6970
return this;
7071
}
7172

http-client/src/main/java/io/avaje/http/client/DHttpClientContextBuilder.java

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
11
package io.avaje.http.client;
22

3-
import io.avaje.inject.BeanScope;
4-
5-
import javax.net.ssl.SSLContext;
6-
import javax.net.ssl.SSLParameters;
73
import java.net.Authenticator;
84
import java.net.CookieHandler;
95
import java.net.ProxySelector;
106
import java.net.http.HttpClient;
117
import java.time.Duration;
8+
import java.util.Collections;
129
import java.util.concurrent.Executor;
1310

11+
import javax.net.ssl.SSLContext;
12+
import javax.net.ssl.SSLParameters;
13+
14+
import io.avaje.inject.BeanScope;
15+
1416
final class DHttpClientContextBuilder extends DBaseBuilder implements HttpClientContext.Builder, HttpClientContext.Builder.State {
1517

1618
DHttpClientContextBuilder() {
@@ -59,14 +61,14 @@ public HttpClientContext.Builder requestLogging(boolean requestLogging) {
5961
}
6062

6163
@Override
62-
public HttpClientContext.Builder requestListener(RequestListener requestListener) {
63-
this.listeners.add(requestListener);
64+
public HttpClientContext.Builder requestListener(RequestListener... requestListener) {
65+
Collections.addAll(listeners, requestListener);
6466
return this;
6567
}
6668

6769
@Override
68-
public HttpClientContext.Builder requestIntercept(RequestIntercept requestIntercept) {
69-
this.interceptors.add(requestIntercept);
70+
public HttpClientContext.Builder requestIntercept(RequestIntercept... requestIntercept) {
71+
Collections.addAll(interceptors, requestIntercept);
7072
return this;
7173
}
7274

http-client/src/main/java/io/avaje/http/client/HttpClient.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,12 +188,12 @@ interface Builder {
188188
*
189189
* @see RequestLogger
190190
*/
191-
Builder requestListener(RequestListener requestListener);
191+
Builder requestListener(RequestListener... requestListener);
192192

193193
/**
194194
* Add a request interceptor. Multiple interceptors may be added.
195195
*/
196-
Builder requestIntercept(RequestIntercept requestIntercept);
196+
Builder requestIntercept(RequestIntercept... requestIntercept);
197197

198198
/**
199199
* Add a Authorization token provider.

http-client/src/main/java/io/avaje/http/client/HttpClientContext.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,12 +165,12 @@ interface Builder {
165165
*
166166
* @see RequestLogger
167167
*/
168-
Builder requestListener(RequestListener requestListener);
168+
Builder requestListener(RequestListener... requestListener);
169169

170170
/**
171171
* Add a request interceptor. Multiple interceptors may be added.
172172
*/
173-
Builder requestIntercept(RequestIntercept requestIntercept);
173+
Builder requestIntercept(RequestIntercept... requestIntercept);
174174

175175
/**
176176
* Add a Authorization token provider.

0 commit comments

Comments
 (0)