2727import javax .inject .Provider ;
2828import java .io .IOException ;
2929import java .io .Reader ;
30+ import java .util .Set ;
3031import java .util .concurrent .Executor ;
3132import java .util .concurrent .TimeUnit ;
3233import java .util .concurrent .atomic .AtomicBoolean ;
@@ -44,29 +45,31 @@ static class Factory {
4445 private final Client client ;
4546 private final Lazy <Executor > httpExecutor ;
4647 private final Provider <Retryer > retryer ;
48+ private final Set <RequestInterceptor > requestInterceptors ;
4749 private final Logger logger ;
4850 private final Provider <Logger .Level > logLevel ;
4951
50- @ Inject Factory (Client client , @ Named ("http" ) Lazy <Executor > httpExecutor , Provider <Retryer > retryer , Logger logger ,
51- Provider <Logger .Level > logLevel ) {
52+ @ Inject Factory (Client client , @ Named ("http" ) Lazy <Executor > httpExecutor , Provider <Retryer > retryer ,
53+ Set < RequestInterceptor > requestInterceptors , Logger logger , Provider <Logger .Level > logLevel ) {
5254 this .client = checkNotNull (client , "client" );
5355 this .httpExecutor = checkNotNull (httpExecutor , "httpExecutor" );
5456 this .retryer = checkNotNull (retryer , "retryer" );
57+ this .requestInterceptors = checkNotNull (requestInterceptors , "requestInterceptors" );
5558 this .logger = checkNotNull (logger , "logger" );
5659 this .logLevel = checkNotNull (logLevel , "logLevel" );
5760 }
5861
5962 public MethodHandler create (Target <?> target , MethodMetadata md , BuildTemplateFromArgs buildTemplateFromArgs ,
6063 Options options , Decoder .TextStream <?> decoder , ErrorDecoder errorDecoder ) {
61- return new SynchronousMethodHandler (target , client , retryer , logger , logLevel , md , buildTemplateFromArgs , options ,
62- decoder , errorDecoder );
64+ return new SynchronousMethodHandler (target , client , retryer , requestInterceptors , logger , logLevel , md ,
65+ buildTemplateFromArgs , options , decoder , errorDecoder );
6366 }
6467
6568 public MethodHandler create (Target <?> target , MethodMetadata md , BuildTemplateFromArgs buildTemplateFromArgs ,
6669 Options options , IncrementalDecoder .TextStream <?> incrementalDecoder ,
6770 ErrorDecoder errorDecoder ) {
68- ObserverHandler observerHandler = new ObserverHandler (target , client , retryer , logger , logLevel , md ,
69- buildTemplateFromArgs , options , incrementalDecoder , errorDecoder , httpExecutor );
71+ ObserverHandler observerHandler = new ObserverHandler (target , client , retryer , requestInterceptors , logger ,
72+ logLevel , md , buildTemplateFromArgs , options , incrementalDecoder , errorDecoder , httpExecutor );
7073 return new ObservableMethodHandler (observerHandler );
7174 }
7275 }
@@ -106,12 +109,14 @@ static class ObserverHandler extends BaseMethodHandler {
106109 private final Lazy <Executor > httpExecutor ;
107110 private final IncrementalDecoder .TextStream <?> incrementalDecoder ;
108111
109- private ObserverHandler (Target <?> target , Client client , Provider <Retryer > retryer , Logger logger ,
112+ private ObserverHandler (Target <?> target , Client client , Provider <Retryer > retryer ,
113+ Set <RequestInterceptor > requestInterceptors , Logger logger ,
110114 Provider <Logger .Level > logLevel , MethodMetadata metadata ,
111115 BuildTemplateFromArgs buildTemplateFromArgs , Options options ,
112116 IncrementalDecoder .TextStream <?> incrementalDecoder , ErrorDecoder errorDecoder ,
113117 Lazy <Executor > httpExecutor ) {
114- super (target , client , retryer , logger , logLevel , metadata , buildTemplateFromArgs , options , errorDecoder );
118+ super (target , client , retryer , requestInterceptors , logger , logLevel , metadata , buildTemplateFromArgs , options ,
119+ errorDecoder );
115120 this .httpExecutor = checkNotNull (httpExecutor , "httpExecutor for %s" , target );
116121 this .incrementalDecoder = checkNotNull (incrementalDecoder , "incrementalDecoder for %s" , target );
117122 }
@@ -185,11 +190,13 @@ private ObserverHandler(Target<?> target, Client client, Provider<Retryer> retry
185190 static class SynchronousMethodHandler extends BaseMethodHandler {
186191 private final Decoder .TextStream <?> decoder ;
187192
188- private SynchronousMethodHandler (Target <?> target , Client client , Provider <Retryer > retryer , Logger logger ,
193+ private SynchronousMethodHandler (Target <?> target , Client client , Provider <Retryer > retryer ,
194+ Set <RequestInterceptor > requestInterceptors , Logger logger ,
189195 Provider <Logger .Level > logLevel , MethodMetadata metadata ,
190196 BuildTemplateFromArgs buildTemplateFromArgs , Options options ,
191197 Decoder .TextStream <?> decoder , ErrorDecoder errorDecoder ) {
192- super (target , client , retryer , logger , logLevel , metadata , buildTemplateFromArgs , options , errorDecoder );
198+ super (target , client , retryer , requestInterceptors , logger , logLevel , metadata , buildTemplateFromArgs , options ,
199+ errorDecoder );
193200 this .decoder = checkNotNull (decoder , "decoder for %s" , target );
194201 }
195202
@@ -215,18 +222,21 @@ static abstract class BaseMethodHandler implements MethodHandler {
215222 protected final Target <?> target ;
216223 protected final Client client ;
217224 protected final Provider <Retryer > retryer ;
225+ protected final Set <RequestInterceptor > requestInterceptors ;
218226 protected final Logger logger ;
219227 protected final Provider <Logger .Level > logLevel ;
220228 protected final BuildTemplateFromArgs buildTemplateFromArgs ;
221229 protected final Options options ;
222230 protected final ErrorDecoder errorDecoder ;
223231
224- private BaseMethodHandler (Target <?> target , Client client , Provider <Retryer > retryer , Logger logger ,
232+ private BaseMethodHandler (Target <?> target , Client client , Provider <Retryer > retryer ,
233+ Set <RequestInterceptor > requestInterceptors , Logger logger ,
225234 Provider <Logger .Level > logLevel , MethodMetadata metadata ,
226235 BuildTemplateFromArgs buildTemplateFromArgs , Options options , ErrorDecoder errorDecoder ) {
227236 this .target = checkNotNull (target , "target" );
228237 this .client = checkNotNull (client , "client for %s" , target );
229238 this .retryer = checkNotNull (retryer , "retryer for %s" , target );
239+ this .requestInterceptors = checkNotNull (requestInterceptors , "requestInterceptors for %s" , target );
230240 this .logger = checkNotNull (logger , "logger for %s" , target );
231241 this .logLevel = checkNotNull (logLevel , "logLevel for %s" , target );
232242 this .metadata = checkNotNull (metadata , "metadata for %s" , target );
@@ -294,6 +304,9 @@ protected long elapsedTime(long start) {
294304 }
295305
296306 protected Request targetRequest (RequestTemplate template ) {
307+ for (RequestInterceptor interceptor : requestInterceptors ) {
308+ interceptor .apply (template );
309+ }
297310 return target .apply (new RequestTemplate (template ));
298311 }
299312
0 commit comments