Skip to content

Commit 17570fd

Browse files
t-ranaDaniel Iancu
t-rana
authored and
Daniel Iancu
committed
OAK-11574: remove usage of Iterators.size() api (apache#2169)
1 parent a11df44 commit 17570fd

File tree

41 files changed

+151
-144
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+151
-144
lines changed

‎oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/AutoMembershipProviderTest.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import org.apache.jackrabbit.api.security.user.UserManager;
2424
import org.apache.jackrabbit.oak.api.QueryEngine;
2525
import org.apache.jackrabbit.oak.api.Root;
26+
import org.apache.jackrabbit.oak.commons.collections.IteratorUtils;
2627
import org.apache.jackrabbit.oak.commons.collections.SetUtils;
2728
import org.apache.jackrabbit.oak.spi.security.authentication.external.ExternalIdentityRef;
2829
import org.apache.jackrabbit.oak.spi.security.authentication.external.basic.DefaultSyncConfig;
@@ -169,10 +170,10 @@ public void testGetMembersExternalUserMultipleIdps() throws Exception {
169170
setExternalId("second", IDP_MIXED_AM);
170171

171172
Iterator<Authorizable> it = provider.getMembers(automembershipGroup1, false);
172-
assertEquals(2, Iterators.size(it));
173+
assertEquals(2, IteratorUtils.size(it));
173174

174175
it = provider.getMembers(automembershipGroup1, true);
175-
assertEquals(2, Iterators.size(it));
176+
assertEquals(2, IteratorUtils.size(it));
176177
} finally {
177178
if (u != null) {
178179
u.remove();
@@ -521,8 +522,8 @@ public void testGetMembershipAutogroupRemoved() throws Exception {
521522
setExternalId(getTestUser().getID(), IDP_VALID_AM);
522523

523524
automembershipGroup1.remove();
524-
assertEquals(1, Iterators.size(provider.getMembership(getTestUser(), false)));
525-
assertEquals(1, Iterators.size(provider.getMembership(getTestUser(), true)));
525+
assertEquals(1, IteratorUtils.size(provider.getMembership(getTestUser(), false)));
526+
assertEquals(1, IteratorUtils.size(provider.getMembership(getTestUser(), true)));
526527

527528
// remove second group : but read principal from cache
528529
automembershipGroup2.remove();

‎oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/DynamicGroupValidatorTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
*/
1717
package org.apache.jackrabbit.oak.spi.security.authentication.external.impl.principal;
1818

19-
import org.apache.jackrabbit.guava.common.collect.Iterators;
2019
import org.apache.jackrabbit.api.security.user.Group;
2120
import org.apache.jackrabbit.api.security.user.User;
2221
import org.apache.jackrabbit.api.security.user.UserManager;
@@ -26,6 +25,7 @@
2625
import org.apache.jackrabbit.oak.api.Tree;
2726
import org.apache.jackrabbit.oak.api.Type;
2827
import org.apache.jackrabbit.oak.commons.PathUtils;
28+
import org.apache.jackrabbit.oak.commons.collections.IteratorUtils;
2929
import org.apache.jackrabbit.oak.commons.collections.ListUtils;
3030
import org.apache.jackrabbit.oak.plugins.memory.PropertyStates;
3131
import org.apache.jackrabbit.oak.plugins.tree.TreeUtil;
@@ -273,7 +273,7 @@ public void testModifyMembersPropertyLocalGroup() throws Exception {
273273
groupTree.setProperty(REP_MEMBERS, members, Type.WEAKREFERENCES);
274274
r.commit();
275275

276-
assertEquals(2, Iterators.size(localGroup.getMembers()));
276+
assertEquals(2, IteratorUtils.size(localGroup.getMembers()));
277277
}
278278

279279

@@ -305,7 +305,7 @@ public void testModifyMembersPropertyRemove() throws Exception {
305305
groupTree.setProperty(REP_MEMBERS, members, Type.WEAKREFERENCES);
306306
r.commit();
307307

308-
assertEquals(1, Iterators.size(localGroup.getMembers()));
308+
assertEquals(1, IteratorUtils.size(localGroup.getMembers()));
309309
}
310310

311311
@Test

‎oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalGroupPrincipalProviderDMTest.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import org.apache.jackrabbit.oak.api.QueryEngine;
2828
import org.apache.jackrabbit.oak.api.Root;
2929
import org.apache.jackrabbit.oak.api.Tree;
30+
import org.apache.jackrabbit.oak.commons.collections.IteratorUtils;
3031
import org.apache.jackrabbit.oak.plugins.tree.TreeUtil;
3132
import org.apache.jackrabbit.oak.spi.security.authentication.external.ExternalIdentityException;
3233
import org.apache.jackrabbit.oak.spi.security.authentication.external.ExternalIdentityRef;
@@ -329,7 +330,7 @@ public void testGetMembershipDeclared() throws Exception {
329330

330331
Iterator<Group> groups = principalProvider.getMembership(user, false);
331332
if (dynamicGroupsEnabled) {
332-
assertEquals(getExpectedNumberOfGroups(), Iterators.size(groups));
333+
assertEquals(getExpectedNumberOfGroups(), IteratorUtils.size(groups));
333334
} else {
334335
assertFalse(groups.hasNext());
335336
}
@@ -342,7 +343,7 @@ public void testGetMembershipInherited() throws Exception {
342343

343344
Iterator<Group> groups = principalProvider.getMembership(user, true);
344345
if (dynamicGroupsEnabled) {
345-
assertEquals(getExpectedNumberOfGroups(), Iterators.size(groups));
346+
assertEquals(getExpectedNumberOfGroups(), IteratorUtils.size(groups));
346347
} else {
347348
assertFalse(groups.hasNext());
348349
}

‎oak-benchmarks-lucene/src/main/java/org/apache/jackrabbit/oak/benchmark/HybridIndexTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
import org.apache.jackrabbit.oak.Oak;
4949
import org.apache.jackrabbit.oak.api.Type;
5050
import org.apache.jackrabbit.oak.api.jmx.IndexStatsMBean;
51+
import org.apache.jackrabbit.oak.commons.collections.IteratorUtils;
5152
import org.apache.jackrabbit.oak.commons.collections.ListUtils;
5253
import org.apache.jackrabbit.oak.fixture.JcrCreator;
5354
import org.apache.jackrabbit.oak.fixture.OakRepositoryFixture;
@@ -553,7 +554,7 @@ private void run0() throws RepositoryException {
553554

554555
//With property index at time traversing index wins (somehow reporting lower cost)
555556
//and that leads to warning. So limit the iterator size
556-
resultSize += Iterators.size(Iterators.limit(result.getNodes(), 500));
557+
resultSize += IteratorUtils.size(Iterators.limit(result.getNodes(), 500));
557558
}
558559
}
559560

‎oak-blob-cloud-azure/src/test/java/org/apache/jackrabbit/oak/blob/cloud/azure/blobstorage/AzureDataStoreTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,14 @@
2727
import static org.junit.Assume.assumeTrue;
2828

2929
import org.apache.commons.lang3.StringUtils;
30-
import org.apache.jackrabbit.guava.common.collect.Iterators;
3130
import com.microsoft.azure.storage.StorageException;
3231

3332
import org.apache.commons.io.IOUtils;
3433
import org.apache.commons.io.output.NullOutputStream;
3534
import org.apache.jackrabbit.core.data.DataIdentifier;
3635
import org.apache.jackrabbit.core.data.DataRecord;
3736
import org.apache.jackrabbit.core.data.DataStoreException;
37+
import org.apache.jackrabbit.oak.commons.collections.IteratorUtils;
3838
import org.apache.jackrabbit.oak.spi.blob.SharedBackend;
3939
import org.junit.After;
4040
import org.junit.Before;
@@ -396,7 +396,7 @@ public void testBackendGetAllIdentifiers() throws DataStoreException, IOExceptio
396396
ids.add(identifier);
397397
}
398398

399-
int actualRecCount = Iterators.size(backend.getAllIdentifiers());
399+
int actualRecCount = IteratorUtils.size(backend.getAllIdentifiers());
400400

401401
for (DataIdentifier identifier : ids) {
402402
backend.deleteRecord(identifier);

‎oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/CachingDataStoreTest.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
import org.apache.jackrabbit.core.data.DataIdentifier;
4141
import org.apache.jackrabbit.core.data.DataRecord;
4242
import org.apache.jackrabbit.core.data.DataStoreException;
43+
import org.apache.jackrabbit.oak.commons.collections.IteratorUtils;
4344
import org.apache.jackrabbit.oak.commons.concurrent.ExecutorCloser;
4445
import org.apache.jackrabbit.oak.spi.blob.AbstractSharedBackend;
4546
import org.apache.jackrabbit.oak.spi.blob.BlobOptions;
@@ -228,7 +229,7 @@ public void zeroCacheAddGetDelete() throws Exception {
228229
assertEquals(id, rec.getIdentifier().toString());
229230
assertFile(rec.getStream(), f, folder);
230231

231-
assertEquals(1, Iterators.size(dataStore.getAllIdentifiers()));
232+
assertEquals(1, IteratorUtils.size(dataStore.getAllIdentifiers()));
232233

233234
dataStore.deleteRecord(new DataIdentifier(id));
234235
rec = dataStore.getRecordIfStored(new DataIdentifier(id));
@@ -260,7 +261,7 @@ public void zeroStagingCacheAddGetDelete() throws Exception {
260261
assertEquals(id, rec.getIdentifier().toString());
261262
assertFile(rec.getStream(), f, folder);
262263

263-
assertEquals(1, Iterators.size(dataStore.getAllIdentifiers()));
264+
assertEquals(1, IteratorUtils.size(dataStore.getAllIdentifiers()));
264265

265266
dataStore.deleteRecord(new DataIdentifier(id));
266267
rec = dataStore.getRecordIfStored(new DataIdentifier(id));
@@ -290,7 +291,7 @@ public void syncAddGetDelete() throws Exception {
290291
assertEquals(id, rec.getIdentifier().toString());
291292
assertFile(rec.getStream(), f, folder);
292293

293-
assertEquals(1, Iterators.size(dataStore.getAllIdentifiers()));
294+
assertEquals(1, IteratorUtils.size(dataStore.getAllIdentifiers()));
294295

295296
dataStore.deleteRecord(new DataIdentifier(id));
296297
rec = dataStore.getRecordIfStored(new DataIdentifier(id));
@@ -323,7 +324,7 @@ public void syncAddGetLoadCache() throws Exception {
323324
File cacheDownloaded = dataStore.getCache().get(id);
324325
assertTrue(FileUtils.contentEquals(f, cacheDownloaded));
325326

326-
assertEquals(1, Iterators.size(dataStore.getAllIdentifiers()));
327+
assertEquals(1, IteratorUtils.size(dataStore.getAllIdentifiers()));
327328

328329
LOG.info("Finished syncAddGetLoadCache");
329330
}

‎oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/UploadStagingCacheTest.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@
5151
import org.apache.commons.io.FileUtils;
5252
import org.apache.jackrabbit.core.data.DataStoreException;
5353
import org.apache.jackrabbit.oak.commons.FileIOUtils;
54+
import org.apache.jackrabbit.oak.commons.collections.IteratorUtils;
5455
import org.apache.jackrabbit.oak.commons.concurrent.ExecutorCloser;
5556
import org.apache.jackrabbit.oak.commons.junit.LogCustomizer;
5657
import org.apache.jackrabbit.oak.stats.DefaultStatisticsProvider;
@@ -144,7 +145,7 @@ public void testZeroCache() throws IOException {
144145
assertFalse(future.isPresent());
145146

146147
assertNull(stagingCache.getIfPresent(ID_PREFIX + 0));
147-
assertEquals(0, Iterators.size(stagingCache.getAllIdentifiers()));
148+
assertEquals(0, IteratorUtils.size(stagingCache.getAllIdentifiers()));
148149
assertEquals(0, stagingCache.getStats().getMaxTotalWeight());
149150
}
150151

@@ -368,7 +369,7 @@ public void testGetAllIdentifiers() throws Exception {
368369

369370
// Should not return anything
370371
idsIter = stagingCache.getAllIdentifiers();
371-
assertEquals(0, Iterators.size(idsIter));
372+
assertEquals(0, IteratorUtils.size(idsIter));
372373
}
373374

374375
/**

‎oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/datastore/BlobIdTrackerTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@
3131
import java.util.concurrent.ScheduledFuture;
3232
import java.util.concurrent.TimeUnit;
3333

34-
import org.apache.jackrabbit.guava.common.collect.Iterators;
3534
import org.apache.jackrabbit.guava.common.io.Closer;
3635
import org.apache.jackrabbit.core.data.DataRecord;
3736
import org.apache.jackrabbit.core.data.DataStoreException;
3837
import org.apache.jackrabbit.oak.commons.FileIOUtils;
38+
import org.apache.jackrabbit.oak.commons.collections.IteratorUtils;
3939
import org.apache.jackrabbit.oak.commons.concurrent.ExecutorCloser;
4040
import org.apache.jackrabbit.oak.plugins.blob.SharedDataStore;
4141

@@ -256,7 +256,7 @@ public void externalAddOffline() throws Exception {
256256
scheduledFuture.get();
257257
initAdd.addAll(offlineLoad);
258258

259-
assertEquals(initAdd.size(), Iterators.size(tracker.get()));
259+
assertEquals(initAdd.size(), IteratorUtils.size(tracker.get()));
260260

261261
Set<String> retrieved = retrieve(tracker);
262262
assertEquals("Extra elements after add", initAdd, retrieved);

‎oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/EffectivePoliciesByPrincipalsAndPathsTest.java‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import org.apache.jackrabbit.commons.jackrabbit.authorization.AccessControlUtils;
2323
import org.apache.jackrabbit.oak.api.Tree;
2424
import org.apache.jackrabbit.oak.commons.PathUtils;
25+
import org.apache.jackrabbit.oak.commons.collections.IteratorUtils;
2526
import org.apache.jackrabbit.oak.namepath.NamePathMapper;
2627
import org.apache.jackrabbit.oak.plugins.tree.TreeUtil;
2728
import org.apache.jackrabbit.oak.spi.namespace.NamespaceConstants;
@@ -117,26 +118,26 @@ public void testNullPath() throws Exception {
117118
assertFalse(effective.hasNext());
118119

119120
effective = acMgr.getEffectivePolicies(Collections.singleton(EveryonePrincipal.getInstance()), new String[] {null});
120-
assertEquals(1, Iterators.size(effective));
121+
assertEquals(1, IteratorUtils.size(effective));
121122
}
122123

123124
@Test
124125
public void testIncludingNullPath() throws Exception {
125126
Iterator<AccessControlPolicy> effective = acMgr.getEffectivePolicies(Collections.singleton(EveryonePrincipal.getInstance()), null, TEST_PATH);
126-
assertEquals(2, Iterators.size(effective));
127+
assertEquals(2, IteratorUtils.size(effective));
127128
}
128129

129130
@Test
130131
public void testNonExistingMatchingNodePath() throws Exception {
131132
Iterator<AccessControlPolicy> effective = acMgr.getEffectivePolicies(Collections.singleton(testPrincipal), NON_EXISTING_CHILD_PATH);
132-
assertEquals(1, Iterators.size(effective));
133+
assertEquals(1, IteratorUtils.size(effective));
133134

134135
effective = acMgr.getEffectivePolicies(Collections.singleton(EveryonePrincipal.getInstance()), NON_EXISTING_CHILD_PATH);
135-
assertEquals(1, Iterators.size(effective));
136+
assertEquals(1, IteratorUtils.size(effective));
136137

137138
// AC setup for both principals is on the same node -> only one effective policy expected
138139
effective = acMgr.getEffectivePolicies(Set.of(EveryonePrincipal.getInstance(), testPrincipal), NON_EXISTING_CHILD_PATH);
139-
assertEquals(1, Iterators.size(effective));
140+
assertEquals(1, IteratorUtils.size(effective));
140141
}
141142

142143
@Test
@@ -152,7 +153,7 @@ public void testNonExistingNotMatchingNodePath() throws Exception {
152153
@Test
153154
public void testNodePaths() throws Exception {
154155
Iterator<AccessControlPolicy> effective = acMgr.getEffectivePolicies(Collections.singleton(EveryonePrincipal.getInstance()), TEST_PATH);
155-
assertEquals(1, Iterators.size(effective));
156+
assertEquals(1, IteratorUtils.size(effective));
156157
}
157158

158159
@Test
@@ -161,7 +162,7 @@ public void testPropertyPath() throws Exception {
161162
String propPath = PathUtils.concat(TEST_PATH, JCR_PRIMARYTYPE);
162163

163164
Iterator<AccessControlPolicy> effective = acMgr.getEffectivePolicies(Collections.singleton(EveryonePrincipal.getInstance()), propPath);
164-
assertEquals(1, Iterators.size(effective));
165+
assertEquals(1, IteratorUtils.size(effective));
165166

166167
// no matching policy
167168
effective = acMgr.getEffectivePolicies(Collections.singleton(testPrincipal), PathUtils.concat(TEST_PATH, JCR_PRIMARYTYPE));
@@ -177,15 +178,15 @@ public void testRestrictions() throws Exception {
177178

178179
// node paths
179180
effective = acMgr.getEffectivePolicies(principalSet, EXISTING_CHILD_PATH);
180-
assertEquals(1, Iterators.size(effective));
181+
assertEquals(1, IteratorUtils.size(effective));
181182

182183
effective = acMgr.getEffectivePolicies(principalSet, NON_EXISTING_CHILD_PATH);
183-
assertEquals(1, Iterators.size(effective));
184+
assertEquals(1, IteratorUtils.size(effective));
184185

185186
// property path
186187
String propPath = PathUtils.concat(EXISTING_CHILD_PATH, JCR_PRIMARYTYPE);
187188
effective = acMgr.getEffectivePolicies(principalSet, propPath);
188-
assertEquals(1, Iterators.size(effective));
189+
assertEquals(1, IteratorUtils.size(effective));
189190

190191
// non-matching path
191192
effective = acMgr.getEffectivePolicies(principalSet, TEST_PATH + "/non-matching");
@@ -199,6 +200,6 @@ public void testReadablePaths() throws Exception {
199200
Iterator<AccessControlPolicy> effective = acMgr.getEffectivePolicies(principalSet,
200201
NodeTypeConstants.NODE_TYPES_PATH,
201202
NamespaceConstants.NAMESPACES_PATH);
202-
assertEquals(1, Iterators.size(effective));
203+
assertEquals(1, IteratorUtils.size(effective));
203204
}
204205
}

‎oak-core/src/test/java/org/apache/jackrabbit/oak/security/principal/EveryoneFilterTest.java‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
import org.apache.jackrabbit.guava.common.collect.Iterators;
2020
import org.apache.jackrabbit.api.security.principal.PrincipalManager;
21+
import org.apache.jackrabbit.oak.commons.collections.IteratorUtils;
2122
import org.apache.jackrabbit.oak.spi.security.principal.EveryonePrincipal;
2223
import org.apache.jackrabbit.oak.spi.security.principal.PrincipalImpl;
2324
import org.junit.Test;
@@ -60,7 +61,7 @@ public void testEveryoneAlreadyIncluded() {
6061
Iterator<Principal> principals = Iterators.forArray(EveryonePrincipal.getInstance(), anotherPrincipal);
6162
Iterator<Principal> result = EveryoneFilter.filter(principals, EveryonePrincipal.NAME, searchType, 0, Long.MAX_VALUE);
6263

63-
assertEquals(2, Iterators.size(result));
64+
assertEquals(2, IteratorUtils.size(result));
6465
}
6566

6667
@Test
@@ -69,7 +70,7 @@ public void testMissingEveryoneNoRange() {
6970
Iterator<Principal> result = EveryoneFilter.filter(principals, EveryonePrincipal.NAME, searchType, 0, Long.MAX_VALUE);
7071

7172
int expectedSize = adjustExpectedSize(searchType, 1);
72-
assertEquals(expectedSize, Iterators.size(result));
73+
assertEquals(expectedSize, IteratorUtils.size(result));
7374
}
7475

7576
@Test
@@ -78,30 +79,30 @@ public void testMissingEveryoneNullHint() {
7879
Iterator<Principal> result = EveryoneFilter.filter(principals, null, searchType, 0, Long.MAX_VALUE);
7980

8081
int expectedSize = adjustExpectedSize(searchType, 1);
81-
assertEquals(expectedSize, Iterators.size(result));
82+
assertEquals(expectedSize, IteratorUtils.size(result));
8283
}
8384

8485
@Test
8586
public void testMissingEveryoneOffset() {
8687
Iterator<Principal> principals = Iterators.forArray(anotherPrincipal);
8788
Iterator<Principal> result = EveryoneFilter.filter(principals, EveryonePrincipal.NAME, searchType, 1, Long.MAX_VALUE);
8889

89-
assertEquals(1, Iterators.size(result));
90+
assertEquals(1, IteratorUtils.size(result));
9091
}
9192

9293
@Test
9394
public void testMissingEveryoneLimit() {
9495
Iterator<Principal> principals = Iterators.forArray();
9596
Iterator<Principal> result = EveryoneFilter.filter(principals, EveryonePrincipal.NAME, searchType, 0, 10);
9697

97-
assertEquals(0, Iterators.size(result));
98+
assertEquals(0, IteratorUtils.size(result));
9899
}
99100

100101
@Test
101102
public void testResultContainsNull() {
102103
Iterator<Principal> principals = Iterators.forArray(anotherPrincipal, null, EveryonePrincipal.getInstance());
103104
Iterator<Principal> result = EveryoneFilter.filter(principals, EveryonePrincipal.NAME, searchType, 0, Long.MAX_VALUE);
104105

105-
assertEquals(3, Iterators.size(result));
106+
assertEquals(3, IteratorUtils.size(result));
106107
}
107108
}

0 commit comments

Comments
 (0)