Skip to content

Commit e3cce72

Browse files
author
Rishabh Kumar
committed
OAK-11432 : removed usage of Guava Iterables.size
1 parent 2cc7f3d commit e3cce72

File tree

48 files changed

+172
-128
lines changed

Some content is hidden

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

48 files changed

+172
-128
lines changed

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

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

19+
import org.apache.commons.collections4.IterableUtils;
1920
import org.apache.jackrabbit.guava.common.collect.Iterables;
2021
import org.apache.jackrabbit.guava.common.collect.Iterators;
2122
import org.apache.jackrabbit.api.security.user.Authorizable;
@@ -657,7 +658,7 @@ public void testSyncMembershipWithForeignGroups() throws Exception {
657658
assertTrue(a.hasProperty(REP_EXTERNAL_PRINCIPAL_NAMES));
658659
Value[] extPrincipalNames = a.getProperty(REP_EXTERNAL_PRINCIPAL_NAMES);
659660

660-
assertEquals(Iterables.size(sameIdpGroups), extPrincipalNames.length);
661+
assertEquals(IterableUtils.size(sameIdpGroups), extPrincipalNames.length);
661662
for (Value v : extPrincipalNames) {
662663
assertNotEquals(foreignGroup.getPrincipalName(), v.getString());
663664
}
@@ -681,7 +682,7 @@ public void testSyncMembershipWithUserRef() throws Exception {
681682
assertTrue(a.hasProperty(REP_EXTERNAL_PRINCIPAL_NAMES));
682683
Value[] extPrincipalNames = a.getProperty(REP_EXTERNAL_PRINCIPAL_NAMES);
683684

684-
assertEquals(Iterables.size(groupRefs), extPrincipalNames.length);
685+
assertEquals(IterableUtils.size(groupRefs), extPrincipalNames.length);
685686
for (Value v : extPrincipalNames) {
686687
assertNotEquals(second.getPrincipalName(), v.getString());
687688
}
@@ -703,7 +704,7 @@ public void testSyncMembershipWithUserConflict() throws Exception {
703704
assertTrue(a.hasProperty(REP_EXTERNAL_PRINCIPAL_NAMES));
704705
Value[] extPrincipalNames = a.getProperty(REP_EXTERNAL_PRINCIPAL_NAMES);
705706

706-
assertEquals(Iterables.size(groupRefs), extPrincipalNames.length);
707+
assertEquals(IterableUtils.size(groupRefs), extPrincipalNames.length);
707708
for (Value v : extPrincipalNames) {
708709
assertNotEquals(previouslySyncedUser.getPrincipalName(), v.getString());
709710
}

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

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

19+
import org.apache.commons.collections4.IterableUtils;
1920
import org.apache.jackrabbit.guava.common.collect.Iterables;
2021
import org.apache.jackrabbit.api.security.user.UserManager;
2122
import org.apache.jackrabbit.oak.api.ContentSession;
@@ -325,7 +326,7 @@ public void testGetProtectedItemImporters() {
325326
@Test
326327
public void testGetMonitors() {
327328
Iterable<Monitor<?>> monitors = externalPrincipalConfiguration.getMonitors(StatisticsProvider.NOOP);
328-
assertEquals(1, Iterables.size(monitors));
329+
assertEquals(1, IterableUtils.size(monitors));
329330
assertTrue(monitors.iterator().next() instanceof ExternalIdentityMonitorImpl);
330331
}
331332

‎oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugPolicyImplTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
*/
1717
package org.apache.jackrabbit.oak.spi.security.authorization.cug.impl;
1818

19+
import org.apache.commons.collections4.IterableUtils;
1920
import org.apache.jackrabbit.guava.common.collect.Iterables;
2021
import org.apache.jackrabbit.api.security.authorization.PrincipalSetPolicy;
2122
import org.apache.jackrabbit.api.security.principal.PrincipalManager;
@@ -109,7 +110,7 @@ public void testCreateWithDuplicateName() {
109110

110111
CugPolicyImpl cugPolicy = createCugPolicy(duplication);
111112
assertEquals(1, cugPolicy.getPrincipals().size());
112-
assertEquals(1, Iterables.size(cugPolicy.getPrincipalNames()));
113+
assertEquals(1, IterableUtils.size(cugPolicy.getPrincipalNames()));
113114
}
114115

115116
@Test

‎oak-core/src/main/java/org/apache/jackrabbit/oak/core/SecureNodeBuilder.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import java.io.InputStream;
2121
import java.util.function.Predicate;
2222

23+
import org.apache.commons.collections4.IterableUtils;
2324
import org.apache.jackrabbit.oak.api.Blob;
2425
import org.apache.jackrabbit.oak.api.PropertyState;
2526
import org.apache.jackrabbit.oak.api.Tree;
@@ -37,7 +38,6 @@
3738

3839
import static java.util.Objects.requireNonNull;
3940
import static org.apache.jackrabbit.guava.common.collect.Iterables.filter;
40-
import static org.apache.jackrabbit.guava.common.collect.Iterables.size;
4141
import static java.util.Collections.emptyList;
4242
import static org.apache.jackrabbit.oak.api.Type.BOOLEAN;
4343
import static org.apache.jackrabbit.oak.api.Type.NAME;
@@ -194,7 +194,7 @@ public synchronized long getPropertyCount() {
194194
if (getTreePermission().canReadProperties() || isNew()) {
195195
return builder.getPropertyCount();
196196
} else {
197-
return size(filter(
197+
return IterableUtils.size(filter(
198198
builder.getProperties(),
199199
new ReadablePropertyPredicate()::test));
200200
}
@@ -334,7 +334,7 @@ public synchronized long getChildNodeCount(long max) {
334334
if (getTreePermission().canReadAll()) {
335335
return builder.getChildNodeCount(max);
336336
} else {
337-
return size(getChildNodeNames());
337+
return IterableUtils.size(getChildNodeNames());
338338
}
339339
}
340340

‎oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/impl/AbstractTree.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
package org.apache.jackrabbit.oak.plugins.tree.impl;
2020

2121
import static org.apache.jackrabbit.guava.common.collect.Iterables.filter;
22-
import static org.apache.jackrabbit.guava.common.collect.Iterables.size;
2322
import static org.apache.jackrabbit.guava.common.collect.Iterables.transform;
2423
import static org.apache.jackrabbit.oak.api.Tree.Status.MODIFIED;
2524
import static org.apache.jackrabbit.oak.api.Tree.Status.NEW;
@@ -32,6 +31,7 @@
3231
import java.util.List;
3332
import java.util.Set;
3433

34+
import org.apache.commons.collections4.IterableUtils;
3535
import org.apache.jackrabbit.oak.api.PropertyState;
3636
import org.apache.jackrabbit.oak.api.Tree;
3737
import org.apache.jackrabbit.oak.commons.PathUtils;
@@ -254,7 +254,7 @@ public boolean hasProperty(@NotNull String name) {
254254

255255
@Override
256256
public long getPropertyCount() {
257-
return size(getProperties());
257+
return IterableUtils.size(getProperties());
258258
}
259259

260260
@Override

‎oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/restriction/GlobsPattern.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
*/
1717
package org.apache.jackrabbit.oak.security.authorization.restriction;
1818

19+
import org.apache.commons.collections4.IterableUtils;
1920
import org.apache.jackrabbit.guava.common.collect.Iterables;
2021
import org.apache.jackrabbit.oak.api.PropertyState;
2122
import org.apache.jackrabbit.oak.api.Tree;
@@ -42,7 +43,7 @@ class GlobsPattern implements RestrictionPattern {
4243
private final GlobPattern[] patterns;
4344

4445
GlobsPattern(@NotNull String path, @NotNull Iterable<String> restrictions) {
45-
ArrayList<GlobPattern> l = new ArrayList<>(Iterables.size(restrictions));
46+
ArrayList<GlobPattern> l = new ArrayList<>(IterableUtils.size(restrictions));
4647
restrictions.forEach(restriction -> {
4748
if (restriction != null) {
4849
l.add(GlobPattern.create(path, restriction));

‎oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/restriction/SubtreePattern.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
*/
1717
package org.apache.jackrabbit.oak.security.authorization.restriction;
1818

19+
import org.apache.commons.collections4.IterableUtils;
1920
import org.apache.jackrabbit.guava.common.collect.Iterables;
2021
import org.apache.jackrabbit.oak.api.PropertyState;
2122
import org.apache.jackrabbit.oak.api.Tree;
@@ -41,7 +42,7 @@ class SubtreePattern implements RestrictionPattern {
4142
SubtreePattern(@NotNull String oakPath, @NotNull Iterable<String> subtrees) {
4243
this.oakPath = oakPath;
4344
this.oakPathLength = oakPath.length();
44-
int size = Iterables.size(subtrees);
45+
int size = IterableUtils.size(subtrees);
4546
List<String> tl = new ArrayList<>(size);
4647
List<String> sl = new ArrayList<>(size);
4748
subtrees.forEach(s -> {

‎oak-core/src/test/java/org/apache/jackrabbit/oak/core/SecureNodeBuilderTest.java‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
*/
1717
package org.apache.jackrabbit.oak.core;
1818

19+
import org.apache.commons.collections4.IterableUtils;
1920
import org.apache.jackrabbit.guava.common.collect.Iterables;
2021
import org.apache.jackrabbit.oak.api.Type;
2122
import org.apache.jackrabbit.oak.commons.LazyValue;
@@ -246,20 +247,20 @@ public void testGetPropertyCountCanReadProperties() {
246247

247248
@Test
248249
public void testGetProperties() {
249-
assertEquals(1, Iterables.size(secureNodeBuilder.getProperties()));
250-
assertEquals(1, Iterables.size(secureNodeBuilder.getChildNode(NAME_ACCESSIBLE).getProperties()));
251-
assertEquals(1, Iterables.size(secureNodeBuilder.getChildNode(NAME_NON_ACCESSIBLE).getProperties()));
252-
assertEquals(0, Iterables.size(secureNodeBuilder.getChildNode(NAME_NON_EXISTING).getProperties()));
250+
assertEquals(1, IterableUtils.size(secureNodeBuilder.getProperties()));
251+
assertEquals(1, IterableUtils.size(secureNodeBuilder.getChildNode(NAME_ACCESSIBLE).getProperties()));
252+
assertEquals(1, IterableUtils.size(secureNodeBuilder.getChildNode(NAME_NON_ACCESSIBLE).getProperties()));
253+
assertEquals(0, IterableUtils.size(secureNodeBuilder.getChildNode(NAME_NON_EXISTING).getProperties()));
253254
}
254255

255256
@Test
256257
public void testGetPropertiesCanReadProperties() {
257258
try {
258259
permissionProvider.canReadProperties = true;
259-
assertEquals(2, Iterables.size(secureNodeBuilder.getProperties()));
260-
assertEquals(2, Iterables.size(secureNodeBuilder.getChildNode(NAME_ACCESSIBLE).getProperties()));
261-
assertEquals(2, Iterables.size(secureNodeBuilder.getChildNode(NAME_NON_ACCESSIBLE).getProperties()));
262-
assertEquals(0, Iterables.size(secureNodeBuilder.getChildNode(NAME_NON_EXISTING).getProperties()));
260+
assertEquals(2, IterableUtils.size(secureNodeBuilder.getProperties()));
261+
assertEquals(2, IterableUtils.size(secureNodeBuilder.getChildNode(NAME_ACCESSIBLE).getProperties()));
262+
assertEquals(2, IterableUtils.size(secureNodeBuilder.getChildNode(NAME_NON_ACCESSIBLE).getProperties()));
263+
assertEquals(0, IterableUtils.size(secureNodeBuilder.getChildNode(NAME_NON_EXISTING).getProperties()));
263264
} finally {
264265
permissionProvider.canReadProperties = false;
265266
}
@@ -268,13 +269,13 @@ public void testGetPropertiesCanReadProperties() {
268269
@Test
269270
public void testGetPropertiesAfterSet() {
270271
secureNodeBuilder.setProperty(PropertyStates.createProperty("another", List.of("v", "v2"), Type.STRINGS));
271-
assertEquals(2, Iterables.size(secureNodeBuilder.getProperties()));
272+
assertEquals(2, IterableUtils.size(secureNodeBuilder.getProperties()));
272273
}
273274

274275
@Test
275276
public void testGetPropertiesAfterRemoval() {
276277
secureNodeBuilder.removeProperty("prop");
277-
assertEquals(0, Iterables.size(secureNodeBuilder.getProperties()));
278+
assertEquals(0, IterableUtils.size(secureNodeBuilder.getProperties()));
278279
}
279280

280281
@Test
@@ -336,9 +337,9 @@ public void testGetNameTypeName() {
336337

337338
@Test
338339
public void testGetNames() {
339-
assertEquals(0, Iterables.size(secureNodeBuilder.getNames("prop")));
340-
assertEquals(0, Iterables.size(secureNodeBuilder.getNames(NAME_NON_EXISTING)));
341-
assertEquals(0, Iterables.size(secureNodeBuilder.getNames(NAME_NON_ACCESSIBLE)));
340+
assertEquals(0, IterableUtils.size(secureNodeBuilder.getNames("prop")));
341+
assertEquals(0, IterableUtils.size(secureNodeBuilder.getNames(NAME_NON_EXISTING)));
342+
assertEquals(0, IterableUtils.size(secureNodeBuilder.getNames(NAME_NON_ACCESSIBLE)));
342343
}
343344

344345
@Test
@@ -351,7 +352,7 @@ public void testGetNamesTypeNames() {
351352
@Test
352353
public void testGetNamesTypeName() {
353354
secureNodeBuilder.setProperty("name", "value", Type.NAME);
354-
assertEquals(0, Iterables.size(secureNodeBuilder.getNames("name")));
355+
assertEquals(0, IterableUtils.size(secureNodeBuilder.getNames("name")));
355356
}
356357

357358
@Test

‎oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexTest.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
import java.util.Arrays;
4040
import java.util.Set;
4141

42+
import org.apache.commons.collections4.IterableUtils;
4243
import org.apache.jackrabbit.oak.api.CommitFailedException;
4344
import org.apache.jackrabbit.oak.api.PropertyState;
4445
import org.apache.jackrabbit.oak.api.PropertyValue;
@@ -1039,7 +1040,7 @@ protected Validator getRootValidator(NodeState before, NodeState after, CommitIn
10391040
NodeState indexedState = getNode(indexed, "/oak:index/foo/" + getNodeForMount(defMount) + "/abc");
10401041
assertTrue(indexedState.exists());
10411042
Iterable<String> values = indexedState.getStrings("entry");
1042-
assertEquals(1, Iterables.size(values));
1043+
assertEquals(1, IterableUtils.size(values));
10431044
assertEquals("/content", Iterables.getFirst(values, null));
10441045

10451046
Mount roMount = mip.getMountByName("foo");
@@ -1087,7 +1088,7 @@ private int getResultSize(NodeState indexed, String name, String value){
10871088
// Query the index
10881089
PropertyIndexLookup lookup = new PropertyIndexLookup(indexed);
10891090
Iterable<String> result = lookup.query(f, name, PropertyValues.newString(value));
1090-
return Iterables.size(result);
1091+
return IterableUtils.size(result);
10911092
}
10921093

10931094
private NodeState createTestData(int entryCount) throws CommitFailedException {

‎oak-core/src/test/java/org/apache/jackrabbit/oak/security/authentication/AuthenticationConfigurationImplTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
*/
1717
package org.apache.jackrabbit.oak.security.authentication;
1818

19+
import org.apache.commons.collections4.IterableUtils;
1920
import org.apache.jackrabbit.guava.common.collect.Iterables;
2021
import org.apache.jackrabbit.oak.api.ContentRepository;
2122
import org.apache.jackrabbit.oak.security.authentication.monitor.LoginModuleMonitorImpl;
@@ -100,7 +101,7 @@ public void testGetMonitors() throws Exception {
100101

101102
StatisticsProvider statisticsProvider = StatisticsProvider.NOOP;
102103
Iterable<Monitor<?>> monitors = authConfiguration.getMonitors(statisticsProvider);
103-
assertEquals(1, Iterables.size(monitors));
104+
assertEquals(1, IterableUtils.size(monitors));
104105

105106
Monitor<?> m = monitors.iterator().next();
106107
assertTrue(m instanceof LoginModuleMonitorImpl);

0 commit comments

Comments
 (0)