Repository: cxf Updated Branches: refs/heads/3.1.x-fixes 96d0e7c75 -> c0077dde9
Spelling correction Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/7691c351 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/7691c351 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/7691c351 Branch: refs/heads/3.1.x-fixes Commit: 7691c351318c8f600b5b0ff08c4369e3dc86c960 Parents: 96d0e7c Author: Colm O hEigeartaigh <[email protected]> Authored: Mon Nov 23 17:23:54 2015 +0000 Committer: Colm O hEigeartaigh <[email protected]> Committed: Mon Nov 23 17:33:07 2015 +0000 ---------------------------------------------------------------------- .../org/apache/cxf/rs/security/oauth2/common/UserSubject.java | 5 +++++ .../org/apache/cxf/rs/security/oauth2/utils/OAuthUtils.java | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/7691c351/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/UserSubject.java ---------------------------------------------------------------------- diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/UserSubject.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/UserSubject.java index 6972220..55f575b 100644 --- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/UserSubject.java +++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/UserSubject.java @@ -134,7 +134,12 @@ public class UserSubject implements Serializable { return am; } + @Deprecated public void setAthenticationMethod(AuthenticationMethod method) { + setAuthenticationMethod(method); + } + + public void setAuthenticationMethod(AuthenticationMethod method) { this.am = method; } http://git-wip-us.apache.org/repos/asf/cxf/blob/7691c351/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/utils/OAuthUtils.java ---------------------------------------------------------------------- diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/utils/OAuthUtils.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/utils/OAuthUtils.java index 51a67a2..74270a3 100644 --- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/utils/OAuthUtils.java +++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/utils/OAuthUtils.java @@ -121,7 +121,7 @@ public final class OAuthUtils { UserSubject subject = new UserSubject(securityContext.getUserPrincipal().getName(), roleNames); Message m = JAXRSUtils.getCurrentMessage(); if (m != null && m.get(AuthenticationMethod.class) != null) { - subject.setAthenticationMethod(m.get(AuthenticationMethod.class)); + subject.setAuthenticationMethod(m.get(AuthenticationMethod.class)); } return subject; }
