This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/master by this push:
new 4da29ea Removing comments
4da29ea is described below
commit 4da29ea7d55227c652b930318666639adae0c77d
Author: Colm O hEigeartaigh <[email protected]>
AuthorDate: Wed Mar 24 10:20:22 2021 +0000
Removing comments
---
.../org/apache/cxf/rs/security/oauth2/client/BearerAuthSupplier.java | 1 -
.../main/java/org/apache/cxf/rt/security/saml/utils/SAMLUtils.java | 5 -----
2 files changed, 6 deletions(-)
diff --git
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/BearerAuthSupplier.java
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/BearerAuthSupplier.java
index d59c5ff..7493840 100644
---
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/BearerAuthSupplier.java
+++
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/BearerAuthSupplier.java
@@ -89,7 +89,6 @@ public class BearerAuthSupplier extends AbstractAuthSupplier
implements HttpAuth
if (theConsumer == null
&& authPolicy != null && authPolicy.getUserName() != null &&
authPolicy.getPassword() != null) {
theConsumer = new Consumer(authPolicy.getUserName(),
authPolicy.getPassword());
-// return false;
}
if (theConsumer == null) {
return false;
diff --git
a/rt/security-saml/src/main/java/org/apache/cxf/rt/security/saml/utils/SAMLUtils.java
b/rt/security-saml/src/main/java/org/apache/cxf/rt/security/saml/utils/SAMLUtils.java
index 27354cf6..bd57e53 100644
---
a/rt/security-saml/src/main/java/org/apache/cxf/rt/security/saml/utils/SAMLUtils.java
+++
b/rt/security-saml/src/main/java/org/apache/cxf/rt/security/saml/utils/SAMLUtils.java
@@ -109,11 +109,6 @@ public final class SAMLUtils {
String name,
String nameFormat
) {
-// String roleAttributeName = name;
-// if (roleAttributeName == null) {
-// roleAttributeName = SAMLClaim.SAML_ROLE_ATTRIBUTENAME_DEFAULT;
-// }
-
Set<Principal> roles = new HashSet<>();
for (Claim claim : claims) {