Author: reschke
Date: Sat May 26 11:57:31 2018
New Revision: 1832304
URL: http://svn.apache.org/viewvc?rev=1832304&view=rev
Log:
OAK-7186: avoid use of guava Iterators.emptyIterator() (ported to 1.8)
Modified:
jackrabbit/oak/branches/1.8/ (props changed)
jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/Delegatee.java
jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalGroupPrincipalProvider.java
jackrabbit/oak/branches/1.8/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalGroupPrincipalProviderTest.java
jackrabbit/oak/branches/1.8/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalPrincipalConfigurationTest.java
jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/UploadStagingCache.java
jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/BlobIdTracker.java
jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreBlobStore.java
jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/identifier/IdentifierManager.java
jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/aggregate/SimpleNodeAggregator.java
jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/CompiledPermissionImpl.java
jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionEntryProviderImpl.java
jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/principal/PrincipalProviderImpl.java
jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserPrincipalProvider.java
jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/GroupPredicate.java
jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/UserQueryManager.java
jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionEntryProviderImplTest.java
jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/query/ResultIteratorTest.java
jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/query/UserQueryManagerTest.java
jackrabbit/oak/branches/1.8/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/principal/CustomPrincipalProvider.java
jackrabbit/oak/branches/1.8/oak-jcr/ (props changed)
jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/VersionHistoryDelegate.java
jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/NodeImpl.java
jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/AbstractActiveDeletedBlobTest.java
jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/EmptyPrincipalProvider.java
jackrabbit/oak/branches/1.8/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/CompositePrincipalConfigurationTest.java
jackrabbit/oak/branches/1.8/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/user/action/ClearMembershipActionTest.java
jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordNumbers.java
jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java
jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollector.java
Propchange: jackrabbit/oak/branches/1.8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat May 26 11:57:31 2018
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1820660-1820661,1820729,1820734,1820859,1820861,1820878,1820888,1820947,1821027,1821130,1821140-1821141,1821178,1821237,1821240,1821249,1821258,1821325,1821358,1821361-1821362,1821370,1821375,1821393,1821477,1821487,1821516,1821617,1821663,1821665,1821668,1821681,1821847,1822121,1822201,1822207,1822723,1822808,1822850,1822934,1823135,1823163,1823169,1823172,1823655,1824196,1824198,1824896,1824962,1825065,1825362,1825381,1825442,1825448,1825466,1825470-1825471,1825475,1825523,1825525,1825619-1825621,1825651,1825654,1825992,1826079,1826090,1826096,1826237,1826338,1826516,1826532,1826551,1826560,1826640,1826932,1826957,1827472,1827486,1827977,1828529,1829527,1829569,1829854,1829864,1829987,1829998,1830019,1830160,1830197,1830748,1831157-1831158,1831163,1831374,1831560
+/jackrabbit/oak/trunk:1820660-1820661,1820729,1820734,1820859,1820861,1820878,1820888,1820947,1821027,1821130,1821140-1821141,1821178,1821237,1821240,1821249,1821258,1821325,1821358,1821361-1821362,1821370,1821375,1821393,1821477,1821487,1821516,1821617,1821663,1821665,1821668,1821681,1821847,1821975-1821983,1822121,1822201,1822207,1822723,1822808,1822850,1822934,1823135,1823163,1823169,1823172,1823655,1824196,1824198,1824896,1824962,1825065,1825362,1825381,1825442,1825448,1825466,1825470-1825471,1825475,1825523,1825525,1825619-1825621,1825651,1825654,1825992,1826079,1826090,1826096,1826237,1826338,1826516,1826532,1826551,1826560,1826640,1826932,1826957,1827472,1827486,1827977,1828529,1829527,1829569,1829854,1829864,1829987,1829998,1830019,1830160,1830197,1830748,1831157-1831158,1831163,1831374,1831560
/jackrabbit/trunk:1345480
Modified:
jackrabbit/oak/branches/1.8/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/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/Delegatee.java?rev=1832304&r1=1832303&r2=1832304&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/Delegatee.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/Delegatee.java
Sat May 26 11:57:31 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/branches/1.8/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/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalGroupPrincipalProvider.java?rev=1832304&r1=1832303&r2=1832304&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalGroupPrincipalProvider.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalGroupPrincipalProvider.java
Sat May 26 11:57:31 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/branches/1.8/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/branches/1.8/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalGroupPrincipalProviderTest.java?rev=1832304&r1=1832303&r2=1832304&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.8/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalGroupPrincipalProviderTest.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalGroupPrincipalProviderTest.java
Sat May 26 11:57:31 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/branches/1.8/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/branches/1.8/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalPrincipalConfigurationTest.java?rev=1832304&r1=1832303&r2=1832304&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.8/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalPrincipalConfigurationTest.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalPrincipalConfigurationTest.java
Sat May 26 11:57:31 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
Modified:
jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/UploadStagingCache.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/UploadStagingCache.java?rev=1832304&r1=1832303&r2=1832304&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/UploadStagingCache.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/UploadStagingCache.java
Sat May 26 11:57:31 2018
@@ -21,6 +21,7 @@ package org.apache.jackrabbit.oak.plugin
import java.io.Closeable;
import java.io.File;
import java.io.IOException;
+import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.concurrent.Callable;
@@ -36,7 +37,6 @@ import javax.annotation.Nullable;
import com.google.common.base.Optional;
import com.google.common.base.Predicate;
import com.google.common.cache.Weigher;
-import com.google.common.collect.Iterators;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.io.Files;
@@ -212,7 +212,7 @@ public class UploadStagingCache implemen
}
@Override protected Iterator<String> getAllIdentifiers() {
- return Iterators.emptyIterator();
+ return Collections.emptyIterator();
}
@Nullable @Override public File getIfPresent(String key) {
Modified:
jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/BlobIdTracker.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/BlobIdTracker.java?rev=1832304&r1=1832303&r2=1832304&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/BlobIdTracker.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/BlobIdTracker.java
Sat May 26 11:57:31 2018
@@ -23,6 +23,7 @@ import java.io.Closeable;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
+import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.concurrent.ScheduledExecutorService;
@@ -34,7 +35,6 @@ import javax.annotation.Nullable;
import com.google.common.base.Function;
import com.google.common.base.Predicate;
import com.google.common.base.Stopwatch;
-import com.google.common.collect.Iterators;
import com.google.common.collect.Lists;
import com.google.common.io.Files;
import org.apache.jackrabbit.core.data.DataRecord;
@@ -199,7 +199,7 @@ public class BlobIdTracker implements Cl
globalMerge();
return store.getRecords();
}
- return Iterators.emptyIterator();
+ return Collections.emptyIterator();
} catch (IOException e) {
LOG.error("Error in retrieving blob records iterator", e);
throw e;
Modified:
jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreBlobStore.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreBlobStore.java?rev=1832304&r1=1832303&r2=1832304&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreBlobStore.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreBlobStore.java
Sat May 26 11:57:31 2018
@@ -31,6 +31,7 @@ import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.SequenceInputStream;
+import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.concurrent.Callable;
@@ -449,7 +450,7 @@ public class DataStoreBlobStore
if (!InMemoryDataRecord.isInstance(blobId)) {
return Iterators.singletonIterator(blobId);
}
- return Iterators.emptyIterator();
+ return Collections.emptyIterator();
}
@Override
Modified:
jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/identifier/IdentifierManager.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/identifier/IdentifierManager.java?rev=1832304&r1=1832303&r2=1832304&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/identifier/IdentifierManager.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/identifier/IdentifierManager.java
Sat May 26 11:57:31 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/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/aggregate/SimpleNodeAggregator.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/aggregate/SimpleNodeAggregator.java?rev=1832304&r1=1832303&r2=1832304&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/aggregate/SimpleNodeAggregator.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/aggregate/SimpleNodeAggregator.java
Sat May 26 11:57:31 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/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/CompiledPermissionImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/CompiledPermissionImpl.java?rev=1832304&r1=1832303&r2=1832304&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/CompiledPermissionImpl.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/CompiledPermissionImpl.java
Sat May 26 11:57:31 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/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionEntryProviderImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionEntryProviderImpl.java?rev=1832304&r1=1832303&r2=1832304&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionEntryProviderImpl.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionEntryProviderImpl.java
Sat May 26 11:57:31 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/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/principal/PrincipalProviderImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/principal/PrincipalProviderImpl.java?rev=1832304&r1=1832303&r2=1832304&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/principal/PrincipalProviderImpl.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/principal/PrincipalProviderImpl.java
Sat May 26 11:57:31 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/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserPrincipalProvider.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserPrincipalProvider.java?rev=1832304&r1=1832303&r2=1832304&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserPrincipalProvider.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserPrincipalProvider.java
Sat May 26 11:57:31 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/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/GroupPredicate.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/GroupPredicate.java?rev=1832304&r1=1832303&r2=1832304&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/GroupPredicate.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/GroupPredicate.java
Sat May 26 11:57:31 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/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/UserQueryManager.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/UserQueryManager.java?rev=1832304&r1=1832303&r2=1832304&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/UserQueryManager.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/UserQueryManager.java
Sat May 26 11:57:31 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/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionEntryProviderImplTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionEntryProviderImplTest.java?rev=1832304&r1=1832303&r2=1832304&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionEntryProviderImplTest.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionEntryProviderImplTest.java
Sat May 26 11:57:31 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/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/query/ResultIteratorTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/query/ResultIteratorTest.java?rev=1832304&r1=1832303&r2=1832304&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/query/ResultIteratorTest.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/query/ResultIteratorTest.java
Sat May 26 11:57:31 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/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/query/UserQueryManagerTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/query/UserQueryManagerTest.java?rev=1832304&r1=1832303&r2=1832304&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/query/UserQueryManagerTest.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/query/UserQueryManagerTest.java
Sat May 26 11:57:31 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
Modified:
jackrabbit/oak/branches/1.8/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/principal/CustomPrincipalProvider.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/principal/CustomPrincipalProvider.java?rev=1832304&r1=1832303&r2=1832304&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.8/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/principal/CustomPrincipalProvider.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/principal/CustomPrincipalProvider.java
Sat May 26 11:57:31 2018
@@ -68,13 +68,13 @@ class CustomPrincipalProvider implements
@Override
public Iterator<? extends Principal> findPrincipals(@Nullable String
nameHint, int searchType) {
// EXERCISE
- return Iterators.emptyIterator();
+ return Collections.emptyIterator();
}
@Nonnull
@Override
public Iterator<? extends Principal> findPrincipals(int searchType) {
// EXERCISE
- return Iterators.emptyIterator();
+ return Collections.emptyIterator();
}
}
\ No newline at end of file
Propchange: jackrabbit/oak/branches/1.8/oak-jcr/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat May 26 11:57:31 2018
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0/oak-jcr:1665962
-/jackrabbit/oak/trunk/oak-jcr:1820660-1820661,1820729,1820734,1820859,1820861,1820878,1820888,1820947,1821130,1821140-1821141,1821240,1821249,1821258,1821325,1821358,1821361-1821362,1821370,1821375,1821393,1821477,1821487,1821516,1821665,1821668,1821681,1822121,1822201,1822207,1822723,1822808,1822850,1822934,1823135,1823163,1823169,1824196,1824198,1824962,1825362,1825381,1825442,1825448,1825466,1825470,1825475,1825523,1825525,1825619-1825621,1825651,1825654,1825992,1826079,1826090,1826096,1826237,1826338,1826516,1826532,1826640,1826932,1826957,1827472,1827486,1827977,1829987,1830019,1830160,1830170
+/jackrabbit/oak/trunk/oak-jcr:1820660-1820661,1820729,1820734,1820859,1820861,1820878,1820888,1820947,1821130,1821140-1821141,1821240,1821249,1821258,1821325,1821358,1821361-1821362,1821370,1821375,1821393,1821477,1821487,1821516,1821665,1821668,1821681,1821979,1822121,1822201,1822207,1822723,1822808,1822850,1822934,1823135,1823163,1823169,1824196,1824198,1824962,1825362,1825381,1825442,1825448,1825466,1825470,1825475,1825523,1825525,1825619-1825621,1825651,1825654,1825992,1826079,1826090,1826096,1826237,1826338,1826516,1826532,1826640,1826932,1826957,1827472,1827486,1827977,1829987,1830019,1830160,1830170
/jackrabbit/trunk/oak-jcr:1345480
Modified:
jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/VersionHistoryDelegate.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/VersionHistoryDelegate.java?rev=1832304&r1=1832303&r2=1832304&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/VersionHistoryDelegate.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/VersionHistoryDelegate.java
Sat May 26 11:57:31 2018
@@ -177,7 +177,7 @@ public class VersionHistoryDelegate exte
NodeDelegate versionable = sessionDelegate.getNodeByIdentifier(id);
if (versionable == null
|| versionable.getPropertyOrNull(JCR_BASEVERSION) == null) {
- return Iterators.emptyIterator();
+ return Collections.emptyIterator();
}
Deque<VersionDelegate> linearVersions = new
ArrayDeque<VersionDelegate>();
VersionManagerDelegate vMgr =
VersionManagerDelegate.create(sessionDelegate);
Modified:
jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/NodeImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/NodeImpl.java?rev=1832304&r1=1832303&r2=1832304&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/NodeImpl.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/NodeImpl.java
Sat May 26 11:57:31 2018
@@ -32,6 +32,7 @@ import static org.apache.jackrabbit.oak.
import java.io.InputStream;
import java.math.BigDecimal;
import java.util.Calendar;
+import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
@@ -1286,7 +1287,7 @@ public class NodeImpl<T extends NodeDele
@Nonnull
private Iterator<String> getMixinTypeNames(@Nonnull Tree tree) throws
RepositoryException {
- Iterator<String> mixinNames = Iterators.emptyIterator();
+ Iterator<String> mixinNames = Collections.emptyIterator();
if (tree.hasProperty(JcrConstants.JCR_MIXINTYPES) ||
canReadProperty(tree, JcrConstants.JCR_MIXINTYPES)) {
mixinNames = TreeUtil.getNames(tree,
JcrConstants.JCR_MIXINTYPES).iterator();
} else if (tree.getStatus() != Status.NEW) {
Modified:
jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/AbstractActiveDeletedBlobTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/AbstractActiveDeletedBlobTest.java?rev=1832304&r1=1832303&r2=1832304&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/AbstractActiveDeletedBlobTest.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/AbstractActiveDeletedBlobTest.java
Sat May 26 11:57:31 2018
@@ -19,6 +19,7 @@ package org.apache.jackrabbit.oak.plugin
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
+import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
@@ -270,7 +271,7 @@ public abstract class AbstractActiveDele
if (delegate instanceof BlobTrackingStore) {
return ((BlobTrackingStore) delegate).getAllRecords();
}
- return Iterators.emptyIterator();
+ return Collections.emptyIterator();
}
@Override public DataRecord getRecordForId(DataIdentifier id) throws
DataStoreException {
Modified:
jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/EmptyPrincipalProvider.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/EmptyPrincipalProvider.java?rev=1832304&r1=1832303&r2=1832304&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/EmptyPrincipalProvider.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/EmptyPrincipalProvider.java
Sat May 26 11:57:31 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/branches/1.8/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/CompositePrincipalConfigurationTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/CompositePrincipalConfigurationTest.java?rev=1832304&r1=1832303&r2=1832304&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.8/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/CompositePrincipalConfigurationTest.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/CompositePrincipalConfigurationTest.java
Sat May 26 11:57:31 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/branches/1.8/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/user/action/ClearMembershipActionTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/user/action/ClearMembershipActionTest.java?rev=1832304&r1=1832303&r2=1832304&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.8/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/user/action/ClearMembershipActionTest.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/user/action/ClearMembershipActionTest.java
Sat May 26 11:57:31 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
Modified:
jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordNumbers.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordNumbers.java?rev=1832304&r1=1832303&r2=1832304&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordNumbers.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordNumbers.java
Sat May 26 11:57:31 2018
@@ -17,8 +17,7 @@
package org.apache.jackrabbit.oak.segment;
-import static com.google.common.collect.Iterators.emptyIterator;
-
+import java.util.Collections;
import java.util.Iterator;
import javax.annotation.Nonnull;
@@ -42,7 +41,7 @@ interface RecordNumbers extends Iterable
@Nonnull
@Override
public Iterator<Entry> iterator() {
- return emptyIterator();
+ return Collections.emptyIterator();
}
};
Modified:
jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java?rev=1832304&r1=1832303&r2=1832304&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java
Sat May 26 11:57:31 2018
@@ -40,7 +40,6 @@ import com.google.common.base.Function;
import com.google.common.base.Predicate;
import com.google.common.collect.AbstractIterator;
import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Iterators;
import com.google.common.collect.Lists;
import com.google.common.collect.Ordering;
import com.google.common.collect.Queues;
@@ -1318,7 +1317,7 @@ public final class NodeDocument extends
@Nonnull
Iterator<NodeDocument> getAllPreviousDocs() {
if (getPreviousRanges().isEmpty()) {
- return Iterators.emptyIterator();
+ return Collections.emptyIterator();
}
//Currently this method would fire one query per previous doc
//If that poses a problem we can try to find all prev doc by relying
@@ -1353,7 +1352,7 @@ public final class NodeDocument extends
@Nonnull
Iterator<NodeDocument> getPreviousDocLeaves() {
if (getPreviousRanges().isEmpty()) {
- return Iterators.emptyIterator();
+ return Collections.emptyIterator();
}
// create a mutable copy
final NavigableMap<Revision, Range> ranges =
Maps.newTreeMap(getPreviousRanges());
Modified:
jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollector.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollector.java?rev=1832304&r1=1832303&r2=1832304&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollector.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollector.java
Sat May 26 11:57:31 2018
@@ -21,6 +21,7 @@ package org.apache.jackrabbit.oak.plugin
import java.io.Closeable;
import java.io.IOException;
+import java.util.Collections;
import java.util.EnumSet;
import java.util.Iterator;
import java.util.List;
@@ -753,7 +754,7 @@ public class VersionGarbageCollector {
private Iterator<String> previousDocIdsFor(NodeDocument doc) {
Map<Revision, Range> prevRanges = doc.getPreviousRanges(true);
if (prevRanges.isEmpty()) {
- return Iterators.emptyIterator();
+ return Collections.emptyIterator();
} else if (all(prevRanges.values(), FIRST_LEVEL)) {
// all previous document ids can be constructed from the
// previous ranges map. this works for first level previous
