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 re...@apache.org on 2022/11/15 14:26:36 UTC
[jackrabbit-oak] branch OAK-9999 created (now 270d1cb87a)
This is an automated email from the ASF dual-hosted git repository.
reschke pushed a change to branch OAK-9999
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
at 270d1cb87a OAK-9999: remove use of com.google.common.collect.Iterators.emptyIterator
This branch includes the following new commits:
new 270d1cb87a OAK-9999: remove use of com.google.common.collect.Iterators.emptyIterator
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[jackrabbit-oak] 01/01: OAK-9999: remove use of com.google.common.collect.Iterators.emptyIterator
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reschke pushed a commit to branch OAK-9999
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit 270d1cb87ac4ae25f3db2a920659b43b06ed752d
Author: Julian Reschke <ju...@gmx.de>
AuthorDate: Tue Nov 15 15:26:18 2022 +0100
OAK-9999: remove use of com.google.common.collect.Iterators.emptyIterator
---
.../authentication/external/basic/AutoMembershipConfig.java | 3 +--
.../external/impl/principal/AutoMembershipProvider.java | 2 +-
.../external/impl/principal/ExternalGroupPrincipalProvider.java | 8 ++++----
.../external/impl/principal/AutoMembershipPrincipalsTest.java | 2 +-
.../jackrabbit/oak/plugins/index/cursor/PrefetchCursor.java | 7 +++----
.../jackrabbit/oak/security/user/AuthorizableIteratorTest.java | 8 ++++----
.../oak/security/user/DynamicMembershipTrackerTest.java | 5 +++--
.../jackrabbit/oak/jcr/delegate/UserManagerDelegatorTest.java | 8 ++++----
.../oak/spi/security/user/DynamicMembershipProvider.java | 9 +++++----
9 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/AutoMembershipConfig.java b/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/AutoMembershipConfig.java
index bd628bca2c..582c8bea37 100644
--- a/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/AutoMembershipConfig.java
+++ b/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/AutoMembershipConfig.java
@@ -16,7 +16,6 @@
*/
package org.apache.jackrabbit.oak.spi.security.authentication.external.basic;
-import com.google.common.collect.Iterators;
import org.apache.jackrabbit.api.security.user.Authorizable;
import org.apache.jackrabbit.api.security.user.Group;
import org.apache.jackrabbit.api.security.user.UserManager;
@@ -82,7 +81,7 @@ public interface AutoMembershipConfig {
@Override
public Iterator<Authorizable> getAutoMembers(@NotNull UserManager userManager, @NotNull Group group) {
- return Iterators.emptyIterator();
+ return Collections.emptyIterator();
}
};
diff --git a/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/AutoMembershipProvider.java b/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/AutoMembershipProvider.java
index d65c9e86fe..102d6fe9b7 100644
--- a/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/AutoMembershipProvider.java
+++ b/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/AutoMembershipProvider.java
@@ -282,7 +282,7 @@ class AutoMembershipProvider implements DynamicMembershipProvider {
private Iterator<Group> getNextInheritedIterator() {
if (inherited.isEmpty()) {
// no more inherited groups to retrieve
- return Iterators.emptyIterator();
+ return Collections.emptyIterator();
} else {
// no need to verify if the inherited iterator has any elements as this has been asserted before
// adding it to the list.
diff --git a/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalGroupPrincipalProvider.java b/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalGroupPrincipalProvider.java
index c3e94001a8..4e65313c35 100644
--- a/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalGroupPrincipalProvider.java
+++ b/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalGroupPrincipalProvider.java
@@ -160,7 +160,7 @@ class ExternalGroupPrincipalProvider implements PrincipalProvider, ExternalIdent
}
Result result = findPrincipals(principalName, true);
- Iterator<? extends ResultRow> rows = (result == null) ? Iterators.emptyIterator() : result.getRows().iterator();
+ Iterator<? extends ResultRow> rows = (result == null) ? Collections.emptyIterator() : result.getRows().iterator();
if (rows.hasNext()) {
return new ExternalGroupPrincipal(principalName, getIdpName(rows.next()));
}
@@ -257,7 +257,7 @@ class ExternalGroupPrincipalProvider implements PrincipalProvider, ExternalIdent
@Override
public @NotNull Iterator<Authorizable> getMembers(@NotNull Group group, boolean includeInherited) throws RepositoryException {
if (!isDynamic(group)) {
- return Iterators.emptyIterator();
+ return Collections.emptyIterator();
} else {
Result result = findPrincipals(group.getPrincipal().getName(), true);
if (result != null) {
@@ -286,11 +286,11 @@ class ExternalGroupPrincipalProvider implements PrincipalProvider, ExternalIdent
@Override
public @NotNull Iterator<Group> getMembership(@NotNull Authorizable authorizable, boolean includeInherited) throws RepositoryException {
if (authorizable.isGroup() || !isDynamic(authorizable)) {
- return Iterators.emptyIterator();
+ return Collections.emptyIterator();
} else {
Value[] vs = authorizable.getProperty(REP_EXTERNAL_PRINCIPAL_NAMES);
if (vs == null || vs.length == 0) {
- return Iterators.emptyIterator();
+ return Collections.emptyIterator();
}
Set<Value> valueSet = ImmutableSet.copyOf(vs);
diff --git a/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/AutoMembershipPrincipalsTest.java b/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/AutoMembershipPrincipalsTest.java
index 9db2c568f7..6cfb638f3f 100644
--- a/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/AutoMembershipPrincipalsTest.java
+++ b/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/AutoMembershipPrincipalsTest.java
@@ -65,7 +65,7 @@ public class AutoMembershipPrincipalsTest extends AbstractAutoMembershipTest {
amp = new AutoMembershipPrincipals(userManager, MAPPING, getAutoMembershipConfigMapping());
when(amConfig.getAutoMembership(authorizable)).thenReturn(ImmutableSet.of(automembershipGroup3.getID()));
- when(amConfig.getAutoMembers(any(UserManager.class), any(Group.class))).thenReturn(Iterators.emptyIterator());
+ when(amConfig.getAutoMembers(any(UserManager.class), any(Group.class))).thenReturn(Collections.emptyIterator());
when(amConfig.getAutoMembers(userManager, automembershipGroup3)).thenReturn(Iterators.singletonIterator(authorizable));
}
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/cursor/PrefetchCursor.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/cursor/PrefetchCursor.java
index 2f5d77ef54..60fe8c512e 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/cursor/PrefetchCursor.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/cursor/PrefetchCursor.java
@@ -17,6 +17,7 @@
package org.apache.jackrabbit.oak.plugins.index.cursor;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
@@ -33,13 +34,11 @@ import org.apache.jackrabbit.oak.spi.state.PrefetchNodeStore;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.collect.Iterators;
-
/**
* A cursor that is able to prefetch nodes from the node store.
*/
public class PrefetchCursor extends AbstractCursor {
-
+
private static final Logger LOG = LoggerFactory.getLogger(PrefetchCursor.class);
// match ${...} -- unfortunately it needs a lot of escaping.
@@ -58,7 +57,7 @@ public class PrefetchCursor extends AbstractCursor {
this.store = store;
this.prefetchCount = prefetchCount;
this.rootState = rootState;
- this.prefetched = Iterators.emptyIterator();
+ this.prefetched = Collections.emptyIterator();
this.prefetchRelative = prefetchRelative;
}
diff --git a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/AuthorizableIteratorTest.java b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/AuthorizableIteratorTest.java
index 42902f1f8d..9eecbdf806 100644
--- a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/AuthorizableIteratorTest.java
+++ b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/AuthorizableIteratorTest.java
@@ -121,7 +121,7 @@ public class AuthorizableIteratorTest extends AbstractSecurityTest {
List<Authorizable> l = ImmutableList.of(getTestUser(), a);
assertEquals(1, Iterators.size(AuthorizableIterator.create(true, l.iterator(), Collections.emptyIterator())));
}
-
+
@Test
public void testGetSize3() throws Exception {
List<User> l = Lists.newArrayList(getTestUser());
@@ -135,10 +135,10 @@ public class AuthorizableIteratorTest extends AbstractSecurityTest {
assertEquals(2, AuthorizableIterator.create(false, adapter, adapter).getSize());
assertEquals(2, AuthorizableIterator.create(true, adapter, adapter).getSize());
}
-
+
@Test
public void testGetSize4() {
- assertEquals(0, AuthorizableIterator.create(Iterators.emptyIterator(), (UserManagerImpl) getUserManager(root), AuthorizableType.AUTHORIZABLE).getSize());
- assertEquals(0, AuthorizableIterator.create(true, Iterators.emptyIterator(), Iterators.emptyIterator()).getSize());
+ assertEquals(0, AuthorizableIterator.create(Collections.emptyIterator(), (UserManagerImpl) getUserManager(root), AuthorizableType.AUTHORIZABLE).getSize());
+ assertEquals(0, AuthorizableIterator.create(true, Collections.emptyIterator(), Collections.emptyIterator()).getSize());
}
}
\ No newline at end of file
diff --git a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/DynamicMembershipTrackerTest.java b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/DynamicMembershipTrackerTest.java
index 94605c0dc6..24fdae5fe0 100644
--- a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/DynamicMembershipTrackerTest.java
+++ b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/DynamicMembershipTrackerTest.java
@@ -16,7 +16,6 @@
*/
package org.apache.jackrabbit.oak.security.user;
-import com.google.common.collect.Iterators;
import org.apache.jackrabbit.api.security.user.Authorizable;
import org.apache.jackrabbit.api.security.user.Group;
import org.apache.jackrabbit.api.security.user.User;
@@ -34,6 +33,8 @@ import org.junit.Rule;
import org.junit.Test;
import org.osgi.framework.ServiceRegistration;
+import com.google.common.collect.Iterators;
+
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -100,7 +101,7 @@ public class DynamicMembershipTrackerTest extends AbstractSecurityTest {
DynamicMembershipProvider dmp = mock(DynamicMembershipProvider.class);
when(dmp.getMembership(eq(a), anyBoolean())).thenReturn(Iterators.singletonIterator(gr));
- when(dmp.getMembership(eq(testUser), anyBoolean())).thenReturn(Iterators.emptyIterator());
+ when(dmp.getMembership(eq(testUser), anyBoolean())).thenReturn(Collections.emptyIterator());
when(dmp.isMember(eq(gr), eq(a), anyBoolean())).thenReturn(true);
when(dmp.coversAllMembers(gr)).thenReturn(true);
diff --git a/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/delegate/UserManagerDelegatorTest.java b/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/delegate/UserManagerDelegatorTest.java
index b860a79ec6..f0c87eae7f 100644
--- a/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/delegate/UserManagerDelegatorTest.java
+++ b/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/delegate/UserManagerDelegatorTest.java
@@ -16,7 +16,6 @@
*/
package org.apache.jackrabbit.oak.jcr.delegate;
-import com.google.common.collect.Iterators;
import org.apache.jackrabbit.api.security.user.Authorizable;
import org.apache.jackrabbit.api.security.user.Group;
import org.apache.jackrabbit.api.security.user.Query;
@@ -27,6 +26,7 @@ import org.jetbrains.annotations.NotNull;
import org.junit.Test;
import java.security.Principal;
+import java.util.Collections;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
@@ -119,9 +119,9 @@ public class UserManagerDelegatorTest extends AbstractDelegatorTest {
@Test
public void testFindAuthorizables() throws Exception {
Query query = mock(Query.class);
- doReturn(Iterators.emptyIterator()).when(um).findAuthorizables(query);
- doReturn(Iterators.emptyIterator()).when(um).findAuthorizables(anyString(), anyString());
- doReturn(Iterators.emptyIterator()).when(um).findAuthorizables(anyString(), anyString(), anyInt());
+ doReturn(Collections.emptyIterator()).when(um).findAuthorizables(query);
+ doReturn(Collections.emptyIterator()).when(um).findAuthorizables(anyString(), anyString());
+ doReturn(Collections.emptyIterator()).when(um).findAuthorizables(anyString(), anyString(), anyInt());
delegator.findAuthorizables(query);
delegator.findAuthorizables("rel/path", "value");
diff --git a/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/user/DynamicMembershipProvider.java b/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/user/DynamicMembershipProvider.java
index c773cfc3bf..8c33e2dff6 100644
--- a/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/user/DynamicMembershipProvider.java
+++ b/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/user/DynamicMembershipProvider.java
@@ -16,12 +16,13 @@
*/
package org.apache.jackrabbit.oak.spi.security.user;
-import com.google.common.collect.Iterators;
import org.apache.jackrabbit.api.security.user.Authorizable;
import org.apache.jackrabbit.api.security.user.Group;
import org.jetbrains.annotations.NotNull;
import javax.jcr.RepositoryException;
+
+import java.util.Collections;
import java.util.Iterator;
public interface DynamicMembershipProvider {
@@ -63,7 +64,7 @@ public interface DynamicMembershipProvider {
* @throws RepositoryException If an error occurs.
*/
@NotNull Iterator<Group> getMembership(@NotNull Authorizable authorizable, boolean includeInherited) throws RepositoryException;
-
+
DynamicMembershipProvider EMPTY = new DynamicMembershipProvider() {
@Override
@@ -73,7 +74,7 @@ public interface DynamicMembershipProvider {
@Override
public @NotNull Iterator<Authorizable> getMembers(@NotNull Group group, boolean includeInherited) {
- return Iterators.emptyIterator();
+ return Collections.emptyIterator();
}
@Override
@@ -83,7 +84,7 @@ public interface DynamicMembershipProvider {
@Override
public @NotNull Iterator<Group> getMembership(@NotNull Authorizable authorizable, boolean includeInherited) {
- return Iterators.emptyIterator();
+ return Collections.emptyIterator();
}
};
}
\ No newline at end of file