Skip to content

Commit 1eaa89e

Browse files
author
Rishabh Kumar
committed
OAK-11333 : removed usage of Guava's Lists.transform with Stream API
1 parent 179728b commit 1eaa89e

File tree

13 files changed

+90
-81
lines changed

13 files changed

+90
-81
lines changed

‎oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/MarkSweepGarbageCollector.java‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,12 @@
5151
import java.util.concurrent.Executor;
5252
import java.util.concurrent.TimeUnit;
5353
import java.util.concurrent.atomic.AtomicInteger;
54+
import java.util.stream.Collectors;
5455

5556
import org.apache.commons.collections4.ListValuedMap;
5657
import org.apache.commons.collections4.multimap.ArrayListValuedHashMap;
5758
import org.apache.jackrabbit.guava.common.base.Stopwatch;
5859
import org.apache.jackrabbit.guava.common.collect.Iterators;
59-
import org.apache.jackrabbit.guava.common.collect.Lists;
6060
import org.apache.jackrabbit.guava.common.collect.Maps;
6161
import org.apache.jackrabbit.guava.common.io.Closeables;
6262
import org.apache.jackrabbit.guava.common.io.Files;
@@ -638,13 +638,14 @@ public void addReference(String blobId, final String nodeId) {
638638
Iterator<String> idIter = blobStore.resolveChunks(blobId);
639639
Iterator<List<String>> partitions = Iterators.partition(idIter, getBatchCount());
640640
while (partitions.hasNext()) {
641-
List<String> idBatch = Lists.transform(partitions.next(), id -> {
642-
if (logPath && nodeId != null) {
643-
return id + DELIM + nodeId;
644-
} else {
645-
return id;
646-
}
647-
});
641+
List<String> idBatch = partitions.next().stream()
642+
.map(id -> {
643+
if (logPath && nodeId != null) {
644+
return id + DELIM + nodeId;
645+
} else {
646+
return id;
647+
}
648+
}).collect(Collectors.toList());
648649
if (debugMode) {
649650
LOG.trace("chunkIds : {}", idBatch);
650651
}

‎oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/aggregate/AggregateIndex.java‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import java.util.Iterator;
2121
import java.util.List;
2222
import java.util.concurrent.atomic.AtomicReference;
23+
import java.util.stream.Collectors;
2324

2425
import org.apache.jackrabbit.oak.spi.query.fulltext.FullTextAnd;
2526
import org.apache.jackrabbit.oak.spi.query.fulltext.FullTextContains;
@@ -35,8 +36,6 @@
3536
import org.slf4j.Logger;
3637
import org.slf4j.LoggerFactory;
3738

38-
import org.apache.jackrabbit.guava.common.collect.Lists;
39-
4039
import static org.apache.jackrabbit.oak.spi.query.QueryIndex.AdvanceFulltextQueryIndex;
4140

4241
/**
@@ -206,9 +205,9 @@ public boolean visit(FullTextAnd and) {
206205
@Override
207206
public boolean visit(FullTextOr or) {
208207
final int[] index = new int[1];
209-
List<Cursor> cursors = Lists.transform(or.list,
210-
input -> flatten(input, plan, filter, state,
211-
path + " or(" + index[0]++ + ")"));
208+
List<Cursor> cursors = or.list.stream()
209+
.map(input -> flatten(input, plan, filter, state, path + " or(" + index[0]++ + ")"))
210+
.collect(Collectors.toList());
212211
result.set(Cursors.newConcatCursor(cursors,
213212
filter.getQueryLimits()));
214213
return true;

‎oak-core/src/main/java/org/apache/jackrabbit/oak/query/xpath/Statement.java‎

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

1919
import java.util.ArrayList;
2020
import java.util.List;
21+
import java.util.stream.Collectors;
2122

2223
import org.apache.jackrabbit.oak.query.QueryOptions;
2324
import org.apache.jackrabbit.oak.query.SQL2Parser;
@@ -27,8 +28,6 @@
2728
import org.apache.jackrabbit.oak.query.xpath.Expression.Property;
2829
import org.apache.jackrabbit.oak.spi.query.QueryConstants;
2930

30-
import org.apache.jackrabbit.guava.common.collect.Lists;
31-
3231
/**
3332
* An xpath statement.
3433
*/
@@ -377,9 +376,9 @@ private static void appendQueryOptions(StringBuilder buff, QueryOptions queryOpt
377376
optionValues.add("prefetches " + queryOptions.prefetchCount.get());
378377
}
379378
if (!queryOptions.prefetch.isEmpty()) {
380-
String list = String.join(", ",
381-
Lists.transform(queryOptions.prefetch,
382-
SQL2Parser::escapeStringLiteral));
379+
String list = queryOptions.prefetch.stream()
380+
.map(SQL2Parser::escapeStringLiteral)
381+
.collect(Collectors.joining(", "));
383382
optionValues.add("prefetch (" + list + ")");
384383
}
385384
buff.append(String.join(", ", optionValues));

‎oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/composite/CompositeAuthorizationConfiguration.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
import java.util.LinkedHashSet;
2222
import java.util.List;
2323
import java.util.Set;
24+
import java.util.stream.Collectors;
2425
import javax.jcr.security.AccessControlManager;
2526

26-
import org.apache.jackrabbit.guava.common.collect.Lists;
2727
import org.apache.jackrabbit.oak.api.Root;
2828
import org.apache.jackrabbit.oak.namepath.NamePathMapper;
2929
import org.apache.jackrabbit.oak.spi.security.CompositeConfiguration;
@@ -140,7 +140,9 @@ public AccessControlManager getAccessControlManager(@NotNull final Root root,
140140
case 0: throw new IllegalStateException();
141141
case 1: return configurations.get(0).getAccessControlManager(root, namePathMapper);
142142
default:
143-
List<AccessControlManager> mgrs = Lists.transform(configurations, authorizationConfiguration -> authorizationConfiguration.getAccessControlManager(root, namePathMapper));
143+
List<AccessControlManager> mgrs = configurations.stream()
144+
.map(authorizationConfiguration -> authorizationConfiguration.getAccessControlManager(root, namePathMapper))
145+
.collect(Collectors.toList());
144146
return new CompositeAccessControlManager(root, namePathMapper, getSecurityProvider(), mgrs, aggregationFilter);
145147
}
146148
}

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

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

1919
import java.util.Arrays;
2020
import java.util.Calendar;
21+
import java.util.stream.Collectors;
2122
import javax.jcr.AccessDeniedException;
2223
import javax.jcr.RepositoryException;
2324
import javax.jcr.Value;
2425

25-
import org.apache.jackrabbit.guava.common.collect.Lists;
2626
import org.apache.jackrabbit.JcrConstants;
2727
import org.apache.jackrabbit.oak.api.PropertyState;
2828
import org.apache.jackrabbit.oak.api.Tree;
@@ -220,7 +220,7 @@ public void setName(String propertyName, String value) {
220220
}
221221

222222
public void setNames(String propertyName, String... values) {
223-
tree.setProperty(propertyName, Lists.transform(Arrays.asList(values), jcrName -> getOakName(jcrName)), NAMES);
223+
tree.setProperty(propertyName, Arrays.stream(values).map(this::getOakName).collect(Collectors.toList()), NAMES);
224224
}
225225

226226
public void setDate(String name, long time) {

‎oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/version/VersionableTest.java‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,9 @@
3535
import org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeConstants;
3636
import org.apache.jackrabbit.test.AbstractJCRTest;
3737

38-
import java.util.HashSet;
38+
import java.util.Arrays;
3939
import java.util.Set;
40-
41-
import static org.apache.jackrabbit.guava.common.collect.Lists.transform;
42-
import static java.util.Arrays.asList;
40+
import java.util.stream.Collectors;
4341

4442
/**
4543
* {@code VersionableTest} contains tests for method relevant to
@@ -438,12 +436,12 @@ private static void assertSuccessors(VersionHistory history, Set<String> expecte
438436
}
439437

440438
private static Set<String> getNames(Version[] versions) {
441-
return new HashSet<>(transform(asList(versions), input -> {
442-
try {
443-
return input.getName();
444-
} catch (RepositoryException e) {
445-
return null;
446-
}
447-
}));
439+
return Arrays.stream(versions).map(input -> {
440+
try {
441+
return input.getName();
442+
} catch (RepositoryException e) {
443+
return null;
444+
}
445+
}).collect(Collectors.toSet());
448446
}
449447
}

‎oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/ResultCountingIndexProvider.java‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
*/
1919
package org.apache.jackrabbit.oak.plugins.index.lucene;
2020

21-
import org.apache.jackrabbit.guava.common.collect.Lists;
2221
import org.apache.jackrabbit.oak.api.Result;
2322
import org.apache.jackrabbit.oak.spi.query.Cursor;
2423
import org.apache.jackrabbit.oak.spi.query.Filter;
@@ -30,6 +29,7 @@
3029
import org.jetbrains.annotations.NotNull;
3130

3231
import java.util.List;
32+
import java.util.stream.Collectors;
3333

3434
class ResultCountingIndexProvider implements QueryIndexProvider {
3535
private final QueryIndexProvider delegate;
@@ -64,13 +64,14 @@ void incrementCount() {
6464
@Override
6565
public List<? extends QueryIndex> getQueryIndexes(NodeState nodeState) {
6666
if (shouldCount) {
67-
return Lists.transform(delegate.getQueryIndexes(nodeState), input -> {
68-
if (input instanceof AdvanceFulltextQueryIndex) {
69-
return new CountingIndex((AdvanceFulltextQueryIndex) input, cursorFactory);
70-
} else {
71-
return input;
72-
}
73-
});
67+
return delegate.getQueryIndexes(nodeState).stream()
68+
.map(input -> {
69+
if (input instanceof AdvanceFulltextQueryIndex) {
70+
return new CountingIndex((AdvanceFulltextQueryIndex) input, cursorFactory);
71+
} else {
72+
return input;
73+
}
74+
}).collect(Collectors.toList());
7475
} else {
7576
return delegate.getQueryIndexes(nodeState);
7677
}

‎oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/CompositeConfiguration.java‎

Lines changed: 22 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
package org.apache.jackrabbit.oak.spi.security;
2020

2121
import org.apache.jackrabbit.guava.common.collect.Iterables;
22-
import org.apache.jackrabbit.guava.common.collect.Lists;
2322
import org.apache.jackrabbit.guava.common.collect.ObjectArrays;
2423
import org.apache.jackrabbit.oak.api.PropertyState;
2524
import org.apache.jackrabbit.oak.api.Tree;
@@ -51,6 +50,7 @@
5150
import java.util.concurrent.ConcurrentHashMap;
5251
import java.util.concurrent.CopyOnWriteArrayList;
5352
import java.util.function.Function;
53+
import java.util.stream.Collectors;
5454

5555
/**
5656
* Abstract base implementation for {@link SecurityConfiguration}s that can
@@ -205,45 +205,52 @@ public ConfigurationParameters getParameters() {
205205
@NotNull
206206
@Override
207207
public WorkspaceInitializer getWorkspaceInitializer() {
208-
return new CompositeWorkspaceInitializer(Lists.transform(getConfigurations(),
209-
securityConfiguration -> securityConfiguration.getWorkspaceInitializer()));
208+
return new CompositeWorkspaceInitializer(getConfigurations().stream()
209+
.map(SecurityConfiguration::getWorkspaceInitializer)
210+
.collect(Collectors.toList()));
210211
}
211212

212213
@NotNull
213214
@Override
214215
public RepositoryInitializer getRepositoryInitializer() {
215-
return new CompositeInitializer(Lists.transform(getConfigurations(),
216-
securityConfiguration -> securityConfiguration.getRepositoryInitializer()));
216+
return new CompositeInitializer(getConfigurations().stream()
217+
.map(SecurityConfiguration::getRepositoryInitializer)
218+
.collect(Collectors.toList()));
217219
}
218220

219221
@NotNull
220222
@Override
221223
public List<? extends CommitHook> getCommitHooks(@NotNull final String workspaceName) {
222-
Iterable<CommitHook> t = Iterables.concat(Lists.transform(getConfigurations(),
223-
securityConfiguration -> securityConfiguration.getCommitHooks(workspaceName)));
224-
return Collections.unmodifiableList(CollectionUtils.toList(t));
224+
return Collections.unmodifiableList(getConfigurations().stream()
225+
.map(securityConfiguration -> securityConfiguration.getCommitHooks(workspaceName))
226+
.flatMap(List::stream).collect(Collectors.toList()));
225227
}
226228

227229
@NotNull
228230
@Override
229231
public List<? extends ValidatorProvider> getValidators(@NotNull final String workspaceName, @NotNull final Set<Principal> principals, @NotNull final MoveTracker moveTracker) {
230-
Iterable<ValidatorProvider> t = Iterables.concat(Lists.transform(getConfigurations(), securityConfiguration -> securityConfiguration.getValidators(workspaceName, principals, moveTracker)));
231-
return Collections.unmodifiableList(CollectionUtils.toList(t));
232+
return Collections.unmodifiableList(getConfigurations().stream()
233+
.map(securityConfiguration -> securityConfiguration.getValidators(workspaceName, principals, moveTracker))
234+
.flatMap(List::stream)
235+
.collect(Collectors.toList()));
232236
}
233237

234238
@NotNull
235239
@Override
236240
public List<ThreeWayConflictHandler> getConflictHandlers() {
237-
return CollectionUtils.toList(Iterables.concat(Lists.transform(getConfigurations(),
238-
securityConfiguration -> securityConfiguration.getConflictHandlers())));
241+
return getConfigurations().stream()
242+
.map(SecurityConfiguration::getConflictHandlers)
243+
.flatMap(List::stream)
244+
.collect(Collectors.toList());
239245
}
240246

241247
@NotNull
242248
@Override
243249
public List<ProtectedItemImporter> getProtectedItemImporters() {
244-
Iterable<ProtectedItemImporter> t = Iterables.concat(Lists.transform(getConfigurations(),
245-
securityConfiguration -> securityConfiguration.getProtectedItemImporters()));
246-
return Collections.unmodifiableList(CollectionUtils.toList(t));
250+
return Collections.unmodifiableList(getConfigurations().stream()
251+
.map(SecurityConfiguration::getProtectedItemImporters)
252+
.flatMap(List::stream)
253+
.collect(Collectors.toList()));
247254
}
248255

249256
@NotNull

‎oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/token/CompositeTokenConfiguration.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
package org.apache.jackrabbit.oak.spi.security.authentication.token;
1818

1919
import java.util.List;
20+
import java.util.stream.Collectors;
2021

21-
import org.apache.jackrabbit.guava.common.collect.Lists;
2222
import org.apache.jackrabbit.oak.api.Root;
2323
import org.apache.jackrabbit.oak.spi.security.CompositeConfiguration;
2424
import org.apache.jackrabbit.oak.spi.security.SecurityProvider;
@@ -40,8 +40,9 @@ public CompositeTokenConfiguration(@NotNull SecurityProvider securityProvider) {
4040
@NotNull
4141
@Override
4242
public TokenProvider getTokenProvider(@NotNull final Root root) {
43-
List<TokenProvider> providers = Lists.transform(getConfigurations(),
44-
tokenConfiguration -> tokenConfiguration.getTokenProvider(root));
43+
List<TokenProvider> providers = getConfigurations().stream()
44+
.map(tokenConfiguration -> tokenConfiguration.getTokenProvider(root))
45+
.collect(Collectors.toList());
4546
return CompositeTokenProvider.newInstance(providers);
4647
}
4748
}

‎oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/xml/PropInfoTest.java‎

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

19-
import org.apache.jackrabbit.guava.common.collect.Lists;
2019
import org.apache.jackrabbit.oak.api.PropertyState;
2120
import org.apache.jackrabbit.oak.api.Type;
2221
import org.jetbrains.annotations.NotNull;
@@ -28,6 +27,7 @@
2827
import javax.jcr.Value;
2928
import javax.jcr.nodetype.PropertyDefinition;
3029
import java.util.List;
30+
import java.util.stream.Collectors;
3131

3232
import static org.junit.Assert.assertArrayEquals;
3333
import static org.junit.Assert.assertEquals;
@@ -241,13 +241,13 @@ public void testGetValuesMultiple() throws Exception {
241241
List<TextValue> tvs = List.of(mockTextValue("24", PropertyType.LONG));
242242
PropInfo propInfo = new PropInfo("longs", PropertyType.LONG, tvs);
243243

244-
assertEquals(Lists.transform(tvs, input -> {
245-
try {
246-
return input.getValue(PropertyType.LONG);
247-
} catch (RepositoryException e) {
248-
throw new RuntimeException();
249-
}
250-
}), propInfo.getValues(PropertyType.LONG));
244+
assertEquals(tvs.stream().map(input -> {
245+
try {
246+
return input.getValue(PropertyType.LONG);
247+
} catch (RepositoryException e) {
248+
throw new RuntimeException(e);
249+
}
250+
}).collect(Collectors.toList()), propInfo.getValues(PropertyType.LONG));
251251
}
252252

253253
@Test

0 commit comments

Comments
 (0)