Commit 6fc43b85 authored by Brian Long's avatar Brian Long
Browse files

Merge branch 'develop' into stable

parents 512f1183 d29ccbef

src/main/java/com/inteligr8/rs/Client.java

+7 −0
Original line number Diff line number Diff line
@@ -14,6 +14,8 @@ 
 */

package com.inteligr8.rs;



import java.util.concurrent.TimeUnit;



import javax.ws.rs.client.ClientBuilder;

import javax.ws.rs.client.WebTarget;
@@ -83,6 +85,11 @@ public abstract class Client { 
				.register(provider)

				.register(new LoggingFilter());

		

		if (this.getConfig().getConnectTimeoutInMillis() != null)

		    clientBuilder.connectTimeout(this.getConfig().getConnectTimeoutInMillis(), TimeUnit.MILLISECONDS);

        if (this.getConfig().getResponseTimeoutInMillis() != null)

            clientBuilder.readTimeout(this.getConfig().getResponseTimeoutInMillis(), TimeUnit.MILLISECONDS);



		if (authFilter == null)

			authFilter = this.getConfig().createAuthorizationFilter();

		if (authFilter != null)

src/main/java/com/inteligr8/rs/ClientConfiguration.java

+10 −0
Original line number Diff line number Diff line
@@ -120,6 +120,16 @@ public interface ClientConfiguration { 
	

	

	

	default Integer getConnectTimeoutInMillis() {

	    return null;

	}

	

	default Integer getResponseTimeoutInMillis() {

	    return null;

	}

	

	



	/**

	 * @return true to enable Jackson UNWRAP_ROOT_VALUE feature; false otherwise.

	 */