add chaining methods for HTTP clients configs

kullfar · kullfar · commit cbad67e169e6 · 2020-08-27T12:16:06.000+03:00
diff --git a/scribejava-core/src/main/java/com/github/scribejava/core/httpclient/jdk/JDKHttpClientConfig.java b/scribejava-core/src/main/java/com/github/scribejava/core/httpclient/jdk/JDKHttpClientConfig.java
@@ -28,6 +28,11 @@ public void setConnectTimeout(Integer connectTimeout) {
         this.connectTimeout = connectTimeout;
     }
 
+    public JDKHttpClientConfig withConnectTimeout(Integer connectTimeout) {
+        this.connectTimeout = connectTimeout;
+        return this;
+    }
+
     public Integer getReadTimeout() {
         return readTimeout;
     }
@@ -36,8 +41,9 @@ public void setReadTimeout(Integer readTimeout) {
         this.readTimeout = readTimeout;
     }
 
-    public boolean isFollowRedirects() {
-        return followRedirects;
+    public JDKHttpClientConfig withReadTimeout(Integer readTimeout) {
+        this.readTimeout = readTimeout;
+        return this;
     }
 
     public void setProxy(Proxy proxy) {
@@ -48,6 +54,15 @@ public Proxy getProxy() {
         return proxy;
     }
 
+    public JDKHttpClientConfig withProxy(Proxy proxy) {
+        this.proxy = proxy;
+        return this;
+    }
+
+    public boolean isFollowRedirects() {
+        return followRedirects;
+    }
+
     /**
      * Sets whether the underlying Http Connection follows redirects or not.
      *
@@ -60,4 +75,19 @@ public Proxy getProxy() {
     public void setFollowRedirects(boolean followRedirects) {
         this.followRedirects = followRedirects;
     }
+
+    /**
+     * Sets whether the underlying Http Connection follows redirects or not.
+     *
+     * Defaults to true (follow redirects)
+     *
+     * @see <a
+     * href="http://docs.oracle.com/javase/6/docs/api/java/net/HttpURLConnection.html#setInstanceFollowRedirects(boolean)">http://docs.oracle.com/javase/6/docs/api/java/net/HttpURLConnection.html#setInstanceFollowRedirects(boolean)</a>
+     * @param followRedirects boolean
+     * @return this for chaining methods invocations
+     */
+    public JDKHttpClientConfig withFollowRedirects(boolean followRedirects) {
+        this.followRedirects = followRedirects;
+        return this;
+    }
 }
diff --git a/scribejava-httpclient-armeria/src/main/java/com/github/scribejava/httpclient/armeria/ArmeriaHttpClientConfig.java b/scribejava-httpclient-armeria/src/main/java/com/github/scribejava/httpclient/armeria/ArmeriaHttpClientConfig.java
@@ -33,6 +33,8 @@ public ArmeriaHttpClientConfig(ClientOptions clientOptions, ClientFactory client
 
     /**
      * Creates new {@link HttpClientConfig} using default settings.
+     *
+     * @return new {@link HttpClientConfig} using default settings.
      */
     @Override
     public HttpClientConfig createDefaultConfig() {
@@ -62,14 +64,29 @@ public void setProtocolPreference(SessionProtocol protocolPreference) {
         this.protocolPreference = protocolPreference;
     }
 
+    public ArmeriaHttpClientConfig withProtocolPreference(SessionProtocol protocolPreference) {
+        setProtocolPreference(protocolPreference);
+        return this;
+    }
+
     public void setRetry(Function<? super HttpClient, RetryingClient> retry) {
         this.retry = retry;
     }
 
+    public ArmeriaHttpClientConfig withRetry(Function<? super HttpClient, RetryingClient> retry) {
+        this.retry = retry;
+        return this;
+    }
+
     public void setLogging(Function<? super HttpClient, LoggingClient> logging) {
         this.logging = logging;
     }
 
+    public ArmeriaHttpClientConfig withLogging(Function<? super HttpClient, LoggingClient> logging) {
+        this.logging = logging;
+        return this;
+    }
+
     ArmeriaWebClientBuilder createClientBuilder() {
         return new ArmeriaWebClientBuilder(clientOptions, clientFactory, protocolPreference, retry, logging);
     }
diff --git a/scribejava-httpclient-armeria/src/test/java/com/github/scribejava/httpclient/armeria/ArmeriaHttpClientTest.java b/scribejava-httpclient-armeria/src/test/java/com/github/scribejava/httpclient/armeria/ArmeriaHttpClientTest.java
@@ -47,9 +47,8 @@ protected HttpClient createNewClient() {
                 .onStatus(HttpStatus.SERVICE_UNAVAILABLE)
                 .onUnprocessed()
                 .thenBackoff(retryBackoff);
-        config.setRetry(RetryingClient.newDecorator(retryRule));
 
-        return new ArmeriaHttpClient(config);
+        return new ArmeriaHttpClient(config.withRetry(RetryingClient.newDecorator(retryRule)));
     }
 
     // No-Op DNS resolver to avoid resolution issues in the unit test
diff --git a/scribejava-httpclient-ning/src/main/java/com/github/scribejava/httpclient/ning/NingHttpClientConfig.java b/scribejava-httpclient-ning/src/main/java/com/github/scribejava/httpclient/ning/NingHttpClientConfig.java
@@ -20,6 +20,11 @@ public void setNingAsyncHttpProviderClassName(String ningAsyncHttpProviderClassN
         this.ningAsyncHttpProviderClassName = ningAsyncHttpProviderClassName;
     }
 
+    public NingHttpClientConfig withNingAsyncHttpProviderClassName(String ningAsyncHttpProviderClassName) {
+        this.ningAsyncHttpProviderClassName = ningAsyncHttpProviderClassName;
+        return this;
+    }
+
     public AsyncHttpClientConfig getConfig() {
         return config;
     }

Original file line number	Diff line number	Diff line change
`@@ -47,9 +47,8 @@ protected HttpClient createNewClient() {`
`47`	`47`	`.onStatus(HttpStatus.SERVICE_UNAVAILABLE)`
`48`	`48`	`.onUnprocessed()`
`49`	`49`	`.thenBackoff(retryBackoff);`
`50`		`- config.setRetry(RetryingClient.newDecorator(retryRule));`
`51`	`50`
`52`		`- return new ArmeriaHttpClient(config);`
	`51`	`+ return new ArmeriaHttpClient(config.withRetry(RetryingClient.newDecorator(retryRule)));`
`53`	`52`	`}`
`54`	`53`
`55`	`54`	`// No-Op DNS resolver to avoid resolution issues in the unit test`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,11 @@ public void setNingAsyncHttpProviderClassName(String ningAsyncHttpProviderClassN`
`20`	`20`	`this.ningAsyncHttpProviderClassName = ningAsyncHttpProviderClassName;`
`21`	`21`	`}`
`22`	`22`
	`23`	`+ public NingHttpClientConfig withNingAsyncHttpProviderClassName(String ningAsyncHttpProviderClassName) {`
	`24`	`+ this.ningAsyncHttpProviderClassName = ningAsyncHttpProviderClassName;`
	`25`	`+ return this;`
	`26`	`+ }`
	`27`	`+`
`23`	`28`	`public AsyncHttpClientConfig getConfig() {`
`24`	`29`	`return config;`
`25`	`30`	`}`