Author: reschke
Date: Tue Jan 23 09:49:17 2018
New Revision: 1821975
URL: http://svn.apache.org/viewvc?rev=1821975&view=rev
Log:
OAK-7186: avoid use of guava Iterators.emptyIterator()
Modified:
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/Delegatee.java
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalGroupPrincipalProvider.java
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalGroupPrincipalProviderTest.java
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalPrincipalConfigurationTest.java
Modified:
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/Delegatee.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/jmx/Delegatee.java?rev=1821975&r1=1821974&r2=1821975&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/Delegatee.java
(original)
+++
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/Delegatee.java
Tue Jan 23 09:49:17 2018
@@ -20,6 +20,7 @@ import java.io.IOException;
import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import javax.annotation.CheckForNull;
@@ -347,7 +348,7 @@ final class Delegatee {
}), Predicates.notNull());
} catch (RepositoryException e) {
log.error("Error while listing orphaned users", e);
- return Iterators.emptyIterator();
+ return Collections.emptyIterator();
}
}
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=1821975&r1=1821974&r2=1821975&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
Tue Jan 23 09:49:17 2018
@@ -163,7 +163,7 @@ class ExternalGroupPrincipalProvider imp
}
}
- return Iterators.emptyIterator();
+ return Collections.emptyIterator();
}
@Nonnull
@@ -333,7 +333,7 @@ class ExternalGroupPrincipalProvider imp
if (result != null) {
return Iterators.asEnumeration(new MemberIterator(result));
} else {
- return
Iterators.asEnumeration(Iterators.<Principal>emptyIterator());
+ return
Iterators.asEnumeration(Collections.<Principal>emptyIterator());
}
}
}
@@ -358,7 +358,7 @@ class ExternalGroupPrincipalProvider imp
private final String queryString;
private final Iterator<? extends ResultRow> rows;
- private Iterator<String> propValues = Iterators.emptyIterator();
+ private Iterator<String> propValues = Collections.emptyIterator();
private GroupPrincipalIterator(@Nullable String queryString, @Nonnull
Result queryResult) {
this.queryString = queryString;
@@ -371,7 +371,7 @@ class ExternalGroupPrincipalProvider imp
if (rows.hasNext()) {
propValues =
rows.next().getValue(REP_EXTERNAL_PRINCIPAL_NAMES).getValue(Type.STRINGS).iterator();
} else {
- propValues = Iterators.emptyIterator();
+ propValues = Collections.emptyIterator();
}
}
while (propValues.hasNext()) {
Modified:
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalGroupPrincipalProviderTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalGroupPrincipalProviderTest.java?rev=1821975&r1=1821974&r2=1821975&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalGroupPrincipalProviderTest.java
(original)
+++
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalGroupPrincipalProviderTest.java
Tue Jan 23 09:49:17 2018
@@ -17,6 +17,7 @@
package
org.apache.jackrabbit.oak.spi.security.authentication.external.impl.principal;
import java.security.Principal;
+import java.util.Collections;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
@@ -26,7 +27,6 @@ import javax.annotation.Nullable;
import com.google.common.base.Function;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Iterables;
-import com.google.common.collect.Iterators;
import org.apache.jackrabbit.api.security.principal.PrincipalManager;
import org.apache.jackrabbit.api.security.user.Authorizable;
import org.apache.jackrabbit.api.security.user.Group;
@@ -310,7 +310,7 @@ public class ExternalGroupPrincipalProvi
@Test
public void testFindPrincipalsByHintTypeNotGroup() {
Iterator<? extends Principal> iter =
principalProvider.findPrincipals("a", PrincipalManager.SEARCH_TYPE_NOT_GROUP);
- assertSame(Iterators.emptyIterator(), iter);
+ assertSame(Collections.emptyIterator(), iter);
}
@Test
@@ -356,7 +356,7 @@ public class ExternalGroupPrincipalProvi
@Test
public void testFindPrincipalsByTypeNotGroup() {
Iterator<? extends Principal> iter =
principalProvider.findPrincipals(PrincipalManager.SEARCH_TYPE_NOT_GROUP);
- assertSame(Iterators.emptyIterator(), iter);
+ assertSame(Collections.emptyIterator(), iter);
}
@Test
Modified:
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalPrincipalConfigurationTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalPrincipalConfigurationTest.java?rev=1821975&r1=1821974&r2=1821975&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalPrincipalConfigurationTest.java
(original)
+++
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalPrincipalConfigurationTest.java
Tue Jan 23 09:49:17 2018
@@ -16,6 +16,7 @@
*/
package
org.apache.jackrabbit.oak.spi.security.authentication.external.impl.principal;
+import java.util.Collections;
import java.util.Dictionary;
import java.util.Hashtable;
import java.util.Iterator;
@@ -26,7 +27,6 @@ import javax.jcr.RepositoryException;
import javax.jcr.ValueFactory;
import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Iterators;
import org.apache.jackrabbit.api.security.user.UserManager;
import org.apache.jackrabbit.oak.api.ContentSession;
import org.apache.jackrabbit.oak.namepath.NamePathMapper;
@@ -287,7 +287,7 @@ public class ExternalPrincipalConfigurat
@Nonnull
@Override
public Iterator<SyncedIdentity> listIdentities(@Nonnull UserManager
userManager) throws RepositoryException {
- return Iterators.emptyIterator();
+ return Collections.emptyIterator();
}
}
}
\ No newline at end of file
