Merge pull request #17 from palantir/feature/feign-options

FeignClientFactory can be configured with timeout Request.Options
palantir · Jan 7, 2016 · ecb409a · ecb409a
2 parents fe8c9c5 + 06a6497
commit ecb409a
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/http-clients/src/main/java/com/palantir/remoting/http/FeignClientFactory.java b/http-clients/src/main/java/com/palantir/remoting/http/FeignClientFactory.java
@@ -22,6 +22,7 @@
 import feign.Client;
 import feign.Contract;
 import feign.Feign;
+import feign.Request;
 import feign.codec.Decoder;
 import feign.codec.Encoder;
 import feign.codec.ErrorDecoder;
@@ -42,20 +43,23 @@ public final class FeignClientFactory {
  private final ErrorDecoder errorDecoder;
  private final Function<Optional<SSLSocketFactory>, Client> clientSupplier;
  private final BackoffStrategy backoffStrategy;
+ private final Request.Options options;
 
  private FeignClientFactory(
  Contract contract,
  Encoder encoder,
  Decoder decoder,
  ErrorDecoder errorDecoder,
  Function<Optional<SSLSocketFactory>, Client> clientSupplier,
- BackoffStrategy backoffStrategy) {
+ BackoffStrategy backoffStrategy,
+ Request.Options options) {
  this.contract = contract;
  this.encoder = encoder;
  this.decoder = decoder;
  this.errorDecoder = errorDecoder;
  this.clientSupplier = clientSupplier;
  this.backoffStrategy = backoffStrategy;
+ this.options = options;
  }
 
  /**
@@ -69,8 +73,8 @@ public static FeignClientFactory of(
  Decoder decoder,
  ErrorDecoder errorDecoder,
  Function<Optional<SSLSocketFactory>, Client> clientSupplier) {
- return new FeignClientFactory(
- contract, encoder, decoder, errorDecoder, clientSupplier, NeverRetryingBackoffStrategy.INSTANCE);
+ return new FeignClientFactory(contract, encoder, decoder, errorDecoder, clientSupplier,
+ NeverRetryingBackoffStrategy.INSTANCE, new Request.Options());
  }
 
  /**
@@ -82,9 +86,10 @@ public static FeignClientFactory of(
  Decoder decoder,
  ErrorDecoder errorDecoder,
  Function<Optional<SSLSocketFactory>, Client> clientSupplier,
- BackoffStrategy backoffStrategy) {
+ BackoffStrategy backoffStrategy,
+ Request.Options options) {
  return new FeignClientFactory(
- contract, encoder, decoder, errorDecoder, clientSupplier, backoffStrategy);
+ contract, encoder, decoder, errorDecoder, clientSupplier, backoffStrategy, options);
  }
 
  /**
@@ -98,6 +103,7 @@ public <T> T createProxy(Optional<SSLSocketFactory> sslSocketFactory, String uri
  .decoder(decoder)
  .errorDecoder(errorDecoder)
  .client(clientSupplier.apply(sslSocketFactory))
+ .options(options)
  .target(type, uri);
  }
 
@@ -117,6 +123,7 @@ public <T> T createProxy(Optional<SSLSocketFactory> sslSocketFactory, Set<String
  .errorDecoder(errorDecoder)
  .client(client)
  .retryer(target)
+ .options(options)
  .target(target);
  }
 

diff --git a/http-clients/src/test/java/com/palantir/remoting/http/FailoverFeignTargetTest.java b/http-clients/src/test/java/com/palantir/remoting/http/FailoverFeignTargetTest.java
@@ -30,6 +30,7 @@
 import com.palantir.remoting.http.errors.SerializableErrorErrorDecoder;
 import com.squareup.okhttp.mockwebserver.MockResponse;
 import com.squareup.okhttp.mockwebserver.MockWebServer;
+import feign.Request;
 import feign.RetryableException;
 import feign.jackson.JacksonDecoder;
 import feign.jackson.JacksonEncoder;
@@ -98,7 +99,8 @@ public void testBackoff() throws Exception {
  new JacksonDecoder(ObjectMappers.guavaJdk7()),
  SerializableErrorErrorDecoder.INSTANCE,
  FeignClientFactory.okHttpClient(),
- backoffStrategy)
+ backoffStrategy,
+ new Request.Options())
  .createProxy(Optional.<SSLSocketFactory>absent(),
  ImmutableSet.of("http://localhost:" + server1.getPort(),
  "http://localhost:" + server2.getPort()),