Repository: cxf Updated Branches: refs/heads/master cfdd0d36c -> af8a95bf9
[CXF-6889] Passing Configuration instead of Configurable Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/af8a95bf Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/af8a95bf Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/af8a95bf Branch: refs/heads/master Commit: af8a95bf93b4273822395e3e7d96d462fe9820f2 Parents: cfdd0d3 Author: Sergey Beryozkin <[email protected]> Authored: Tue Jul 11 12:12:41 2017 +0100 Committer: Sergey Beryozkin <[email protected]> Committed: Tue Jul 11 12:12:41 2017 +0100 ---------------------------------------------------------------------- .../java/org/apache/cxf/jaxrs/client/spec/ClientImpl.java | 2 +- .../apache/cxf/jaxrs/client/spec/InvocationBuilderImpl.java | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/af8a95bf/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientImpl.java ---------------------------------------------------------------------- diff --git a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientImpl.java b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientImpl.java index b23d85e..983f3e6 100644 --- a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientImpl.java +++ b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spec/ClientImpl.java @@ -307,7 +307,7 @@ public class ClientImpl implements Client { } // Start building the invocation return new InvocationBuilderImpl(WebClient.fromClient(targetClient), - configImpl); + getConfiguration()); } private void setConnectionProperties(Map<String, Object> configProps, ClientConfiguration clientCfg) { Long connTimeOutValue = getLongValue(configProps.get(HTTP_CONNECTION_TIMEOUT_PROP)); http://git-wip-us.apache.org/repos/asf/cxf/blob/af8a95bf/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spec/InvocationBuilderImpl.java ---------------------------------------------------------------------- diff --git a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spec/InvocationBuilderImpl.java b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spec/InvocationBuilderImpl.java index ab5fa96..2a1ba9b 100644 --- a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spec/InvocationBuilderImpl.java +++ b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spec/InvocationBuilderImpl.java @@ -34,9 +34,8 @@ import javax.ws.rs.client.Invocation.Builder; import javax.ws.rs.client.InvocationCallback; import javax.ws.rs.client.RxInvoker; import javax.ws.rs.client.SyncInvoker; -import javax.ws.rs.client.WebTarget; import javax.ws.rs.core.CacheControl; -import javax.ws.rs.core.Configurable; +import javax.ws.rs.core.Configuration; import javax.ws.rs.core.Cookie; import javax.ws.rs.core.GenericType; import javax.ws.rs.core.HttpHeaders; @@ -55,10 +54,10 @@ public class InvocationBuilderImpl implements Invocation.Builder { private WebClient webClient; private SyncInvoker sync; - private Configurable<WebTarget> config; + private Configuration config; public InvocationBuilderImpl(WebClient webClient, - Configurable<WebTarget> config) { + Configuration config) { this.webClient = webClient; this.sync = webClient.sync(); this.config = config; @@ -391,7 +390,7 @@ public class InvocationBuilderImpl implements Invocation.Builder { } private ExecutorService getConfiguredExecutorService() { - return (ExecutorService)config.getConfiguration().getProperty("executorService"); + return (ExecutorService)config.getProperty("executorService"); } }
