You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by an...@apache.org on 2019/10/31 17:40:41 UTC
svn commit: r1869225 -
/jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalGroupPrincipalProvider.java
Author: angela
Date: Thu Oct 31 17:40:41 2019
New Revision: 1869225
URL: http://svn.apache.org/viewvc?rev=1869225&view=rev
Log:
OAK-8733 : Simplify ExternalGroupPrincipalProvider
Modified:
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalGroupPrincipalProvider.java
Modified: jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalGroupPrincipalProvider.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalGroupPrincipalProvider.java?rev=1869225&r1=1869224&r2=1869225&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalGroupPrincipalProvider.java (original)
+++ jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalGroupPrincipalProvider.java Thu Oct 31 17:40:41 2019
@@ -222,7 +222,7 @@ class ExternalGroupPrincipalProvider imp
}
private Set<Principal> getGroupPrincipals(@NotNull Tree userTree) {
- if (userTree.exists() && UserUtil.isType(userTree, AuthorizableType.USER) && userTree.hasProperty(REP_EXTERNAL_PRINCIPAL_NAMES)) {
+ if (userTree.exists() && UserUtil.isType(userTree, AuthorizableType.USER)) {
PropertyState ps = userTree.getProperty(REP_EXTERNAL_PRINCIPAL_NAMES);
if (ps != null) {
// we have an 'external' user that has been synchronized with the dynamic-membership option
@@ -401,14 +401,14 @@ class ExternalGroupPrincipalProvider imp
protected Principal getNext() {
if (!propValues.hasNext()) {
if (rows.hasNext()) {
- propValues = rows.next().getValue(REP_EXTERNAL_PRINCIPAL_NAMES).getValue(Type.STRINGS).iterator();
+ propValues = Iterators.filter(rows.next().getValue(REP_EXTERNAL_PRINCIPAL_NAMES).getValue(Type.STRINGS).iterator(), Predicates.notNull());
} else {
propValues = Collections.emptyIterator();
}
}
while (propValues.hasNext()) {
String principalName = propValues.next();
- if (principalName != null && !processed.contains(principalName) && matchesQuery(principalName) ) {
+ if (!processed.contains(principalName) && matchesQuery(principalName) ) {
processed.add(principalName);
return new ExternalGroupPrincipal(principalName);
}