Author: reschke
Date: Tue Jan 23 09:49:45 2018
New Revision: 1821981
URL: http://svn.apache.org/viewvc?rev=1821981&view=rev
Log:
OAK-7186: avoid use of guava Iterators.emptyIterator()
Modified:
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/EmptyPrincipalProvider.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/CompositePrincipalConfigurationTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/user/action/ClearMembershipActionTest.java
Modified:
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/EmptyPrincipalProvider.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/EmptyPrincipalProvider.java?rev=1821981&r1=1821980&r2=1821981&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/EmptyPrincipalProvider.java
(original)
+++
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/EmptyPrincipalProvider.java
Tue Jan 23 09:49:45 2018
@@ -18,13 +18,13 @@ package org.apache.jackrabbit.oak.spi.se
import java.security.Principal;
import java.security.acl.Group;
+import java.util.Collections;
import java.util.Iterator;
import java.util.Set;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Iterators;
/**
* Implementation of the {@code PrincipalProvider} interface that never
@@ -56,12 +56,12 @@ public final class EmptyPrincipalProvide
@Nonnull
@Override
public Iterator<? extends Principal> findPrincipals(@Nullable String
nameHint, int searchType) {
- return Iterators.emptyIterator();
+ return Collections.emptyIterator();
}
@Nonnull
@Override
public Iterator<? extends Principal> findPrincipals(int searchType) {
- return Iterators.emptyIterator();
+ return Collections.emptyIterator();
}
}
\ No newline at end of file
Modified:
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/CompositePrincipalConfigurationTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/CompositePrincipalConfigurationTest.java?rev=1821981&r1=1821980&r2=1821981&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/CompositePrincipalConfigurationTest.java
(original)
+++
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/CompositePrincipalConfigurationTest.java
Tue Jan 23 09:49:45 2018
@@ -19,6 +19,7 @@ package org.apache.jackrabbit.oak.spi.se
import java.lang.reflect.Field;
import java.security.Principal;
import java.security.acl.Group;
+import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
@@ -27,7 +28,7 @@ import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Iterators;
+
import org.apache.jackrabbit.api.security.principal.PrincipalManager;
import org.apache.jackrabbit.oak.api.Root;
import org.apache.jackrabbit.oak.namepath.NamePathMapper;
@@ -172,13 +173,13 @@ public class CompositePrincipalConfigura
@Nonnull
@Override
public Iterator<? extends Principal> findPrincipals(@Nullable
String nameHint, int searchType) {
- return Iterators.emptyIterator();
+ return Collections.emptyIterator();
}
@Nonnull
@Override
public Iterator<? extends Principal> findPrincipals(int
searchType) {
- return Iterators.emptyIterator();
+ return Collections.emptyIterator();
}
};
}
Modified:
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/user/action/ClearMembershipActionTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/user/action/ClearMembershipActionTest.java?rev=1821981&r1=1821980&r2=1821981&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/user/action/ClearMembershipActionTest.java
(original)
+++
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/user/action/ClearMembershipActionTest.java
Tue Jan 23 09:49:45 2018
@@ -17,6 +17,7 @@
package org.apache.jackrabbit.oak.spi.security.user.action;
import java.security.Principal;
+import java.util.Collections;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
@@ -61,7 +62,7 @@ public class ClearMembershipActionTest {
@Test
public void testOnRemoveUserNoMembership() throws Exception {
- when(user.declaredMemberOf()).thenReturn(Iterators.emptyIterator());
+ when(user.declaredMemberOf()).thenReturn(Collections.emptyIterator());
action.onRemove(user, root, NamePathMapper.DEFAULT);
}
@@ -149,7 +150,7 @@ public class ClearMembershipActionTest {
@Override
public Iterator<Group> declaredMemberOf() throws RepositoryException {
- return Iterators.emptyIterator();
+ return Collections.emptyIterator();
}
@Override
