Author: reschke
Date: Tue Jan 23 09:49:29 2018
New Revision: 1821977
URL: http://svn.apache.org/viewvc?rev=1821977&view=rev
Log:
OAK-7186: avoid use of guava Iterators.emptyIterator()
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/identifier/IdentifierManager.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/aggregate/SimpleNodeAggregator.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/CompiledPermissionImpl.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionEntryProviderImpl.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/principal/PrincipalProviderImpl.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserPrincipalProvider.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/GroupPredicate.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/UserQueryManager.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionEntryProviderImplTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/query/ResultIteratorTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/query/UserQueryManagerTest.java
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/identifier/IdentifierManager.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/identifier/IdentifierManager.java?rev=1821977&r1=1821976&r2=1821977&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/identifier/IdentifierManager.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/identifier/IdentifierManager.java
Tue Jan 23 09:49:29 2018
@@ -53,7 +53,6 @@ import org.slf4j.LoggerFactory;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Predicates.notNull;
-import static com.google.common.collect.Iterators.emptyIterator;
import static com.google.common.collect.Iterators.filter;
import static com.google.common.collect.Iterators.singletonIterator;
import static com.google.common.collect.Iterators.transform;
@@ -280,7 +279,7 @@ public class IdentifierManager {
return
singletonIterator(PathUtils.concat(rowPath, propertyName));
}
}
- return emptyIterator();
+ return Collections.emptyIterator();
}
}
};
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/aggregate/SimpleNodeAggregator.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/aggregate/SimpleNodeAggregator.java?rev=1821977&r1=1821976&r2=1821977&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/aggregate/SimpleNodeAggregator.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/aggregate/SimpleNodeAggregator.java
Tue Jan 23 09:49:29 2018
@@ -27,6 +27,7 @@ import static org.apache.jackrabbit.oak.
import static org.apache.jackrabbit.oak.commons.PathUtils.getParentPath;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
@@ -36,8 +37,6 @@ import org.apache.jackrabbit.oak.api.Pro
import org.apache.jackrabbit.oak.spi.query.QueryIndex;
import org.apache.jackrabbit.oak.spi.state.NodeState;
-import com.google.common.collect.Iterators;
-
/**
* List based NodeAggregator
*
@@ -94,7 +93,7 @@ public class SimpleNodeAggregator implem
}
}
- return Iterators.emptyIterator();
+ return Collections.emptyIterator();
}
private static boolean isNodeType(NodeState root, String path, Set<String>
types) {
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/CompiledPermissionImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/CompiledPermissionImpl.java?rev=1821977&r1=1821976&r2=1821977&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/CompiledPermissionImpl.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/CompiledPermissionImpl.java
Tue Jan 23 09:49:29 2018
@@ -20,6 +20,7 @@ import java.security.Principal;
import java.security.acl.Group;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
@@ -30,7 +31,6 @@ import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Iterators;
import org.apache.jackrabbit.JcrConstants;
import org.apache.jackrabbit.commons.iterator.AbstractLazyIterator;
import org.apache.jackrabbit.oak.api.PropertyState;
@@ -594,7 +594,7 @@ final class CompiledPermissionImpl imple
private final EntryPredicate predicate;
// the ordered permission entries at a given path in the hierarchy
- private Iterator<PermissionEntry> nextEntries =
Iterators.emptyIterator();
+ private Iterator<PermissionEntry> nextEntries =
Collections.emptyIterator();
private TreePermissionImpl tp;
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionEntryProviderImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionEntryProviderImpl.java?rev=1821977&r1=1821976&r2=1821977&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionEntryProviderImpl.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionEntryProviderImpl.java
Tue Jan 23 09:49:29 2018
@@ -27,7 +27,6 @@ import java.util.TreeSet;
import javax.annotation.Nonnull;
import com.google.common.base.Strings;
-import com.google.common.collect.Iterators;
import org.apache.jackrabbit.commons.iterator.AbstractLazyIterator;
import org.apache.jackrabbit.oak.api.Tree;
import org.apache.jackrabbit.oak.commons.LongUtils;
@@ -124,7 +123,7 @@ class PermissionEntryProviderImpl implem
@Nonnull
public Iterator<PermissionEntry> getEntryIterator(@Nonnull EntryPredicate
predicate) {
if (existingNames.isEmpty()) {
- return Iterators.emptyIterator();
+ return Collections.emptyIterator();
} else {
return new EntryIterator(predicate);
}
@@ -172,7 +171,7 @@ class PermissionEntryProviderImpl implem
private final EntryPredicate predicate;
// the ordered permission entries at a given path in the hierarchy
- private Iterator<PermissionEntry> nextEntries =
Iterators.emptyIterator();
+ private Iterator<PermissionEntry> nextEntries =
Collections.emptyIterator();
// the next oak path for which to retrieve permission entries
private String path;
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/principal/PrincipalProviderImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/principal/PrincipalProviderImpl.java?rev=1821977&r1=1821976&r2=1821977&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/principal/PrincipalProviderImpl.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/principal/PrincipalProviderImpl.java
Tue Jan 23 09:49:29 2018
@@ -124,7 +124,7 @@ class PrincipalProviderImpl implements P
}
} catch (RepositoryException e) {
log.debug(e.getMessage());
- return Iterators.emptyIterator();
+ return Collections.emptyIterator();
}
}
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserPrincipalProvider.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserPrincipalProvider.java?rev=1821977&r1=1821976&r2=1821977&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserPrincipalProvider.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserPrincipalProvider.java
Tue Jan 23 09:49:29 2018
@@ -171,7 +171,7 @@ class UserPrincipalProvider implements P
}
} catch (ParseException e) {
log.debug(e.getMessage());
- return Iterators.emptyIterator();
+ return Collections.emptyIterator();
}
}
@@ -430,7 +430,7 @@ class UserPrincipalProvider implements P
@Override
Iterator<Authorizable> getMembers() throws RepositoryException {
org.apache.jackrabbit.api.security.user.Group g = getGroup();
- return (g == null) ? Iterators.<Authorizable>emptyIterator() :
g.getMembers();
+ return (g == null) ? Collections.<Authorizable>emptyIterator() :
g.getMembers();
}
@CheckForNull
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/GroupPredicate.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/GroupPredicate.java?rev=1821977&r1=1821976&r2=1821977&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/GroupPredicate.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/GroupPredicate.java
Tue Jan 23 09:49:29 2018
@@ -16,6 +16,7 @@
*/
package org.apache.jackrabbit.oak.security.user.query;
+import java.util.Collections;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
@@ -24,7 +25,6 @@ import javax.annotation.Nullable;
import javax.jcr.RepositoryException;
import com.google.common.base.Predicate;
-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;
@@ -47,7 +47,7 @@ class GroupPredicate implements Predicat
if (group != null) {
membersIterator = (declaredMembersOnly) ?
group.getDeclaredMembers() : group.getMembers();
} else {
- membersIterator = Iterators.emptyIterator();
+ membersIterator = Collections.emptyIterator();
}
}
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/UserQueryManager.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/UserQueryManager.java?rev=1821977&r1=1821976&r2=1821977&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/UserQueryManager.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/UserQueryManager.java
Tue Jan 23 09:49:29 2018
@@ -19,6 +19,7 @@ package org.apache.jackrabbit.oak.securi
import static org.apache.jackrabbit.oak.api.QueryEngine.NO_BINDINGS;
import java.text.ParseException;
+import java.util.Collections;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
@@ -87,7 +88,7 @@ public class UserQueryManager {
query.build(builder);
if (builder.getMaxCount() == 0) {
- return Iterators.emptyIterator();
+ return Collections.emptyIterator();
}
String statement = buildXPathStatement(builder);
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionEntryProviderImplTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionEntryProviderImplTest.java?rev=1821977&r1=1821976&r2=1821977&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionEntryProviderImplTest.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionEntryProviderImplTest.java
Tue Jan 23 09:49:29 2018
@@ -18,13 +18,13 @@ package org.apache.jackrabbit.oak.securi
import java.lang.reflect.Field;
import java.util.Collection;
+import java.util.Collections;
import java.util.Map;
import java.util.Set;
import javax.annotation.Nonnull;
import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Iterators;
import com.google.common.collect.Sets;
import org.apache.jackrabbit.oak.api.Root;
@@ -67,7 +67,7 @@ public class PermissionEntryProviderImpl
// test that PermissionEntryProviderImpl.existingNames nevertheless is
// properly filled with all principal names for which permission
entries exist
assertEquals(principalNames, existingNamesField.get(provider));
- assertNotSame(Iterators.emptyIterator(), provider.getEntryIterator(new
EntryPredicate()));
+ assertNotSame(Collections.emptyIterator(),
provider.getEntryIterator(new EntryPredicate()));
}
/**
@@ -90,7 +90,7 @@ public class PermissionEntryProviderImpl
Set<String> existingNames = getExistingNames(provider);
assertEquals(principalNames, existingNames);
- assertNotSame(Iterators.emptyIterator(), provider.getEntryIterator(new
EntryPredicate()));
+ assertNotSame(Collections.emptyIterator(),
provider.getEntryIterator(new EntryPredicate()));
}
/**
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/query/ResultIteratorTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/query/ResultIteratorTest.java?rev=1821977&r1=1821976&r2=1821977&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/query/ResultIteratorTest.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/query/ResultIteratorTest.java
Tue Jan 23 09:49:29 2018
@@ -16,6 +16,7 @@
*/
package org.apache.jackrabbit.oak.security.user.query;
+import java.util.Collections;
import java.util.Iterator;
import java.util.NoSuchElementException;
@@ -31,7 +32,7 @@ public class ResultIteratorTest {
@Test(expected = IllegalArgumentException.class)
public void createWithNegativeOffset() {
- ResultIterator.create(-1, ResultIterator.MAX_ALL,
Iterators.emptyIterator());
+ ResultIterator.create(-1, ResultIterator.MAX_ALL,
Collections.emptyIterator());
}
@Test
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/query/UserQueryManagerTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/query/UserQueryManagerTest.java?rev=1821977&r1=1821976&r2=1821977&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/query/UserQueryManagerTest.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/query/UserQueryManagerTest.java
Tue Jan 23 09:49:29 2018
@@ -18,6 +18,7 @@ package org.apache.jackrabbit.oak.securi
import java.security.Principal;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import javax.annotation.Nonnull;
@@ -28,7 +29,6 @@ import javax.jcr.ValueFactory;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
-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;
@@ -245,7 +245,7 @@ public class UserQueryManagerTest extend
}
};
- assertSame(Iterators.emptyIterator(), queryMgr.findAuthorizables(q));
+ assertSame(Collections.emptyIterator(), queryMgr.findAuthorizables(q));
}
@Test
