Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 876BF18A24 for ; Tue, 24 Nov 2015 14:17:09 +0000 (UTC) Received: (qmail 51186 invoked by uid 500); 24 Nov 2015 14:17:09 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 51126 invoked by uid 500); 24 Nov 2015 14:17:09 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 51112 invoked by uid 99); 24 Nov 2015 14:17:09 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 24 Nov 2015 14:17:09 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id EB196E00BD; Tue, 24 Nov 2015 14:17:06 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sergeyb@apache.org To: commits@cxf.apache.org Message-Id: <442c9b7765c54d3cb02c25748b2e97a7@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: cxf git commit: More updates to OAuthInvoker Date: Tue, 24 Nov 2015 14:17:06 +0000 (UTC) Repository: cxf Updated Branches: refs/heads/master 3724268af -> 52e24f340 More updates to OAuthInvoker Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/52e24f34 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/52e24f34 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/52e24f34 Branch: refs/heads/master Commit: 52e24f340f3350d5623c4503da4cedc2a60b3b18 Parents: 3724268 Author: Sergey Beryozkin Authored: Tue Nov 24 14:16:50 2015 +0000 Committer: Sergey Beryozkin Committed: Tue Nov 24 14:16:50 2015 +0000 ---------------------------------------------------------------------- .../rs/security/oauth2/client/ClientCodeRequestFilter.java | 1 - .../apache/cxf/rs/security/oauth2/client/OAuthInvoker.java | 9 ++++++--- 2 files changed, 6 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/52e24f34/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/ClientCodeRequestFilter.java ---------------------------------------------------------------------- diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/ClientCodeRequestFilter.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/ClientCodeRequestFilter.java index c54a992..ae54e99 100644 --- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/ClientCodeRequestFilter.java +++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/ClientCodeRequestFilter.java @@ -195,7 +195,6 @@ public class ClientCodeRequestFilter implements ContainerRequestFilter { ClientTokenContext tokenContext = initializeClientTokenContext(rc, at, state); if (at != null && clientTokenContextManager != null) { clientTokenContextManager.setClientTokenContext(mc, tokenContext); - JAXRSUtils.getCurrentMessage().setContent(ClientTokenContextManager.class, clientTokenContextManager); } setClientCodeRequest(tokenContext); } http://git-wip-us.apache.org/repos/asf/cxf/blob/52e24f34/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/OAuthInvoker.java ---------------------------------------------------------------------- diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/OAuthInvoker.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/OAuthInvoker.java index 6775b4b..8bd49ab 100644 --- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/OAuthInvoker.java +++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/OAuthInvoker.java @@ -33,6 +33,7 @@ import org.apache.cxf.rs.security.oauth2.common.ClientAccessToken; public class OAuthInvoker extends JAXRSInvoker { private WebClient accessTokenServiceClient; + private ClientTokenContextManager clientTokenContextManager; private Consumer consumer; @Override protected Object performInvocation(Exchange exchange, final Object serviceObject, Method m, @@ -49,11 +50,9 @@ public class OAuthInvoker extends JAXRSInvoker { accessToken = OAuthClientUtils.refreshAccessToken(accessTokenServiceClient, consumer, accessToken); - ClientTokenContextManager contextManager = - exchange.getInMessage().getContent(ClientTokenContextManager.class); MessageContext mc = new MessageContextImpl(inMessage); ((ClientTokenContextImpl)tokenContext).setToken(accessToken); - contextManager.setClientTokenContext(mc, tokenContext); + clientTokenContextManager.setClientTokenContext(mc, tokenContext); //retry return super.performInvocation(exchange, serviceObject, m, paramArray); @@ -71,4 +70,8 @@ public class OAuthInvoker extends JAXRSInvoker { public void setConsumer(Consumer consumer) { this.consumer = consumer; } + + public void setClientTokenContextManager(ClientTokenContextManager clientTokenContextManager) { + this.clientTokenContextManager = clientTokenContextManager; + } }