You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by re...@apache.org on 2024/10/26 17:23:45 UTC
(jackrabbit-oak) branch OAK-11229 created (now 66ecede7cb)
This is an automated email from the ASF dual-hosted git repository.
reschke pushed a change to branch OAK-11229
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
at 66ecede7cb OAK-11229: remove usage of newArrayList(Iterable/Iterator)
This branch includes the following new commits:
new 66ecede7cb OAK-11229: remove usage of newArrayList(Iterable/Iterator)
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
(jackrabbit-oak) 01/01: OAK-11229: remove usage of newArrayList(Iterable/Iterator)
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reschke pushed a commit to branch OAK-11229
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit 66ecede7cb5d13e1c40805872f6433e84750e9f9
Author: Julian Reschke <re...@apache.org>
AuthorDate: Sat Oct 26 18:23:20 2024 +0100
OAK-11229: remove usage of newArrayList(Iterable/Iterator)
---
.../apache/jackrabbit/oak/spi/blob/AbstractBlobStoreTest.java | 6 +++---
.../apache/jackrabbit/oak/plugins/cow/BranchNodeStore.java | 3 ++-
.../jackrabbit/oak/plugins/nodetype/TypeRegistration.java | 1 +
.../jackrabbit/oak/plugins/observation/EventGenerator.java | 1 +
.../main/java/org/apache/jackrabbit/oak/query/ast/InImpl.java | 2 +-
.../main/java/org/apache/jackrabbit/oak/query/ast/OrImpl.java | 4 ++--
.../authorization/accesscontrol/AccessControlManagerImpl.java | 2 +-
.../oak/security/internal/SecurityProviderRegistration.java | 11 ++++++-----
.../oak/plugins/blob/datastore/DataStoreTrackerGCTest.java | 2 +-
.../oak/jcr/observation/ObservationManagerImpl.java | 2 +-
.../jackrabbit/oak/jcr/observation/ObservationTest.java | 2 +-
.../plugins/index/lucene/directory/OakBufferedIndexFile.java | 2 +-
.../org/apache/jackrabbit/oak/query/facet/FacetResult.java | 6 +++---
.../jackrabbit/oak/segment/aws/AwsArchiveManagerTest.java | 2 +-
.../apache/jackrabbit/oak/segment/DefaultSegmentWriter.java | 2 +-
.../org/apache/jackrabbit/oak/segment/SegmentIdTable.java | 2 +-
.../org/apache/jackrabbit/oak/segment/file/tar/TarReader.java | 4 ++--
.../jackrabbit/oak/plugins/document/DocumentNodeStore.java | 4 ++--
.../jackrabbit/oak/plugins/document/LastRevRecoveryAgent.java | 2 +-
.../oak/plugins/document/DocumentNodeStoreTest.java | 2 +-
.../jackrabbit/oak/plugins/document/NodeStoreDiffTest.java | 5 ++---
.../apache/jackrabbit/oak/plugins/memory/MemoryNodeStore.java | 4 ++--
.../jackrabbit/oak/plugins/memory/MultiPropertyState.java | 1 +
.../apache/jackrabbit/oak/plugins/memory/PropertyBuilder.java | 2 +-
24 files changed, 39 insertions(+), 35 deletions(-)
diff --git a/oak-blob/src/test/java/org/apache/jackrabbit/oak/spi/blob/AbstractBlobStoreTest.java b/oak-blob/src/test/java/org/apache/jackrabbit/oak/spi/blob/AbstractBlobStoreTest.java
index 2cffb97501..e160e36572 100644
--- a/oak-blob/src/test/java/org/apache/jackrabbit/oak/spi/blob/AbstractBlobStoreTest.java
+++ b/oak-blob/src/test/java/org/apache/jackrabbit/oak/spi/blob/AbstractBlobStoreTest.java
@@ -418,7 +418,7 @@ public abstract class AbstractBlobStoreTest {
public void delete() throws Exception {
Set<String> ids = createArtifacts();
- store.deleteChunks(Lists.newArrayList(ids), 0);
+ store.deleteChunks(new ArrayList<>(ids), 0);
Iterator<String> iter = store.getAllChunkIds(0);
Set<String> ret = new HashSet<>();
@@ -433,7 +433,7 @@ public abstract class AbstractBlobStoreTest {
public void deleteCount() throws Exception {
Set<String> ids = createArtifacts();
- long count = store.countDeleteChunks(Lists.newArrayList(ids), 0);
+ long count = store.countDeleteChunks(new ArrayList<>(ids), 0);
Iterator<String> iter = store.getAllChunkIds(0);
Set<String> ret = new HashSet<>();
@@ -463,7 +463,7 @@ public abstract class AbstractBlobStoreTest {
while (iter.hasNext()) {
chunks.add(iter.next());
}
- long count = store.countDeleteChunks(Lists.newArrayList(chunks), beforeUpdateTime);
+ long count = store.countDeleteChunks(new ArrayList<>(chunks), beforeUpdateTime);
assertEquals("Deleted updated blobs", 0, count);
}
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/cow/BranchNodeStore.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/cow/BranchNodeStore.java
index f5fbb5b694..1426cf54fb 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/cow/BranchNodeStore.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/cow/BranchNodeStore.java
@@ -31,6 +31,7 @@ import org.jetbrains.annotations.NotNull;
import java.io.Closeable;
import java.io.IOException;
import java.io.InputStream;
+import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Map;
@@ -124,7 +125,7 @@ public class BranchNodeStore implements NodeStore, Observable {
@NotNull
@Override
public Iterable<String> checkpoints() {
- List<String> result = newArrayList(inheritedCheckpoints);
+ List<String> result = new ArrayList<>(inheritedCheckpoints);
result.retainAll(newArrayList(nodeStore.checkpoints()));
checkpointMapping.entrySet().stream()
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/TypeRegistration.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/TypeRegistration.java
index 1323c01eb9..b0c66ea674 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/TypeRegistration.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/TypeRegistration.java
@@ -77,6 +77,7 @@ import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.apache.jackrabbit.guava.common.collect.Iterables;
+import org.apache.jackrabbit.guava.common.collect.Lists;
/**
* This class is used by the {@link TypeEditorProvider} to check for,
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/EventGenerator.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/EventGenerator.java
index 34ea91e580..669f37c882 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/EventGenerator.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/EventGenerator.java
@@ -25,6 +25,7 @@ import static org.apache.jackrabbit.oak.plugins.tree.TreeConstants.OAK_CHILD_ORD
import static org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState.MISSING_NODE;
import static org.apache.jackrabbit.oak.spi.state.MoveDetector.SOURCE_PATH;
+import java.util.ArrayList;
import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedList;
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/InImpl.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/InImpl.java
index bddbdb1f89..3d95a2d87a 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/InImpl.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/InImpl.java
@@ -66,7 +66,7 @@ public class InImpl extends ConstraintImpl {
return new ComparisonImpl(
operand1, Operator.EQUAL, set.iterator().next());
} else if (set.size() != operand2.size()) {
- return new InImpl(operand1, newArrayList(set));
+ return new InImpl(operand1, new ArrayList<>(set));
} else {
return this;
}
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/OrImpl.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/OrImpl.java
index ccda13ebad..0c94170073 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/OrImpl.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/OrImpl.java
@@ -114,7 +114,7 @@ public class OrImpl extends ConstraintImpl {
entry.getKey(), EQUAL, values.iterator().next()));
} else {
simplified.add(new InImpl(
- entry.getKey(), newArrayList(values)));
+ entry.getKey(), new ArrayList<>(values)));
}
}
@@ -309,7 +309,7 @@ public class OrImpl extends ConstraintImpl {
}
}
- InImpl in = new InImpl(operand, newArrayList(values));
+ InImpl in = new InImpl(operand, new ArrayList<>(values));
in.setQuery(query);
in.restrictPushDown(s);
}
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlManagerImpl.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlManagerImpl.java
index a392cd43a3..24aacd60c5 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlManagerImpl.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlManagerImpl.java
@@ -219,7 +219,7 @@ public class AccessControlManagerImpl extends AbstractAccessControlManager imple
AccessControlPolicy[] plcs = getPolicies(principalAcl.principal);
PrincipalACL existing = (plcs.length == 0) ? null : (PrincipalACL) plcs[0];
- List<ACE> toAdd = Lists.newArrayList(principalAcl.getEntries());
+ List<ACE> toAdd = new ArrayList<>(principalAcl.getEntries());
List<ACE> toRemove = Collections.emptyList();
if (existing != null) {
toAdd.removeAll(existing.getEntries());
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/security/internal/SecurityProviderRegistration.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/security/internal/SecurityProviderRegistration.java
index 5bddaf2dd4..9d873a5882 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/security/internal/SecurityProviderRegistration.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/security/internal/SecurityProviderRegistration.java
@@ -76,6 +76,7 @@ import org.slf4j.LoggerFactory;
import javax.jcr.security.AccessControlManager;
import java.security.Principal;
+import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.Dictionary;
@@ -599,7 +600,7 @@ public class SecurityProviderRegistration {
protected List<RestrictionProvider> getServices() {
Collection<RestrictionProvider> values = restrictionProviders.values();
synchronized (restrictionProviders) {
- return newArrayList(values);
+ return new ArrayList<>(values);
}
}
@@ -613,7 +614,7 @@ public class SecurityProviderRegistration {
protected List<AuthorizableActionProvider> getServices() {
Collection<AuthorizableActionProvider> values = authorizableActionProviders.values();
synchronized (authorizableActionProviders) {
- return newArrayList(values);
+ return new ArrayList<>(values);
}
}
@@ -627,7 +628,7 @@ public class SecurityProviderRegistration {
protected List<AuthorizableNodeName> getServices() {
Collection<AuthorizableNodeName> values = authorizableNodeNames.values();
synchronized (authorizableNodeNames) {
- return newArrayList(values);
+ return new ArrayList<>(values);
}
}
@@ -641,7 +642,7 @@ public class SecurityProviderRegistration {
protected List<UserAuthenticationFactory> getServices() {
Collection<UserAuthenticationFactory> values = userAuthenticationFactories.values();
synchronized (userAuthenticationFactories) {
- return newArrayList(values);
+ return new ArrayList<>(values);
}
}
@@ -651,7 +652,7 @@ public class SecurityProviderRegistration {
private AggregationFilter createAggregationFilter() {
List<AggregationFilter> filters;
synchronized (aggregationFilters) {
- filters = newArrayList(aggregationFilters.values());
+ filters = new ArrayList<>(aggregationFilters.values());
}
switch (filters.size()) {
case 0: return AggregationFilter.DEFAULT;
diff --git a/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreTrackerGCTest.java b/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreTrackerGCTest.java
index 3bbee0011e..c6ba6c0625 100644
--- a/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreTrackerGCTest.java
+++ b/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreTrackerGCTest.java
@@ -250,7 +250,7 @@ public class DataStoreTrackerGCTest {
DataStoreState state = init(cluster.nodeStore, 0);
// Directly delete from blobstore
- ArrayList<String> blobs = Lists.newArrayList(state.blobsPresent);
+ ArrayList<String> blobs = new ArrayList<>(state.blobsPresent);
String removedId = blobs.remove(0);
((DataStoreBlobStore) s).deleteChunks(Lists.newArrayList(removedId), 0);
state.blobsPresent = new HashSet<>(blobs);
diff --git a/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/ObservationManagerImpl.java b/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/ObservationManagerImpl.java
index 90f81ba0a8..30335b99ad 100644
--- a/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/ObservationManagerImpl.java
+++ b/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/ObservationManagerImpl.java
@@ -139,7 +139,7 @@ public class ObservationManagerImpl implements JackrabbitObservationManager {
List<ChangeProcessor> toBeStopped;
synchronized (this) {
- toBeStopped = newArrayList(processors.values());
+ toBeStopped = new ArrayList<>(processors.values());
processors.clear();
}
diff --git a/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/observation/ObservationTest.java b/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/observation/ObservationTest.java
index 982ff17775..e3d053c654 100644
--- a/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/observation/ObservationTest.java
+++ b/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/observation/ObservationTest.java
@@ -1371,7 +1371,7 @@ public class ObservationTest extends AbstractRepositoryTest {
}
public List<Event> getUnexpected() {
- return Lists.newArrayList(unexpected);
+ return new ArrayList<>(unexpected);
}
@Override
diff --git a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/OakBufferedIndexFile.java b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/OakBufferedIndexFile.java
index 9f137eae91..b517b757ce 100644
--- a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/OakBufferedIndexFile.java
+++ b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/OakBufferedIndexFile.java
@@ -153,7 +153,7 @@ class OakBufferedIndexFile implements OakIndexFile {
this.position = that.position;
this.length = that.length;
- this.data = newArrayList(that.data);
+ this.data = new ArrayList<>(that.data);
this.dataModified = that.dataModified;
this.blobFactory = that.blobFactory;
}
diff --git a/oak-query-spi/src/main/java/org/apache/jackrabbit/oak/query/facet/FacetResult.java b/oak-query-spi/src/main/java/org/apache/jackrabbit/oak/query/facet/FacetResult.java
index edc3d2f757..8cdd2c3f95 100644
--- a/oak-query-spi/src/main/java/org/apache/jackrabbit/oak/query/facet/FacetResult.java
+++ b/oak-query-spi/src/main/java/org/apache/jackrabbit/oak/query/facet/FacetResult.java
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.jackrabbit.oak.query.facet;
-import org.apache.jackrabbit.guava.common.collect.Lists;
import org.apache.jackrabbit.guava.common.collect.Maps;
import org.apache.jackrabbit.oak.commons.json.JsopBuilder;
import org.apache.jackrabbit.oak.commons.json.JsopReader;
@@ -42,6 +40,8 @@ import java.util.Set;
import static java.util.Collections.reverseOrder;
import static java.util.Comparator.comparingInt;
+import java.util.ArrayList;
+
/**
* A facet result is a wrapper for {@link javax.jcr.query.QueryResult} capable of returning information about facets
* stored in the query result {@link javax.jcr.query.Row}s.
@@ -135,7 +135,7 @@ public class FacetResult {
label = null;
}
}
- facets = Lists.newArrayList(facetsMap.values());
+ facets = new ArrayList<>(facetsMap.values());
Collections.sort(facets, reverseOrder(comparingInt(Facet::getCount)));
perDimFacets.put(dimension, facets);
}
diff --git a/oak-segment-aws/src/test/java/org/apache/jackrabbit/oak/segment/aws/AwsArchiveManagerTest.java b/oak-segment-aws/src/test/java/org/apache/jackrabbit/oak/segment/aws/AwsArchiveManagerTest.java
index 6b6593f1bb..8db0c01f2f 100644
--- a/oak-segment-aws/src/test/java/org/apache/jackrabbit/oak/segment/aws/AwsArchiveManagerTest.java
+++ b/oak-segment-aws/src/test/java/org/apache/jackrabbit/oak/segment/aws/AwsArchiveManagerTest.java
@@ -93,7 +93,7 @@ public class AwsArchiveManagerTest {
LinkedHashMap<UUID, byte[]> recovered = new LinkedHashMap<>();
manager.recoverEntries("data00000a.tar", recovered);
- assertEquals(uuids.subList(0, 5), newArrayList(recovered.keySet()));
+ assertEquals(uuids.subList(0, 5), new ArrayList<>(recovered.keySet()));
}
@Test
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/DefaultSegmentWriter.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/DefaultSegmentWriter.java
index de105cc9fd..ed153deb05 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/DefaultSegmentWriter.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/DefaultSegmentWriter.java
@@ -480,7 +480,7 @@ public class DefaultSegmentWriter implements SegmentWriter {
int shift = 32 - (level + 1) * MapRecord.BITS_PER_LEVEL;
List<List<MapEntry>> buckets =
- newArrayList(nCopies(MapRecord.BUCKETS_PER_LEVEL, (List<MapEntry>) null));
+ new ArrayList<>(nCopies(MapRecord.BUCKETS_PER_LEVEL, (List<MapEntry>) null));
for (MapEntry entry : entries) {
int index = (entry.getHash() >> shift) & mask;
List<MapEntry> bucket = buckets.get(index);
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentIdTable.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentIdTable.java
index 0ec87d1d50..13d950c520 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentIdTable.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentIdTable.java
@@ -60,7 +60,7 @@ public class SegmentIdTable {
* entries would be slower).
*/
private final ArrayList<WeakReference<SegmentId>> references =
- newArrayList(nCopies(1024, (WeakReference<SegmentId>) null));
+ new ArrayList<>(nCopies(1024, (WeakReference<SegmentId>) null));
private static final Logger LOG = LoggerFactory.getLogger(SegmentIdTable.class);
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/TarReader.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/TarReader.java
index 3bc36a3f5f..c1cd30e4cd 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/TarReader.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/TarReader.java
@@ -18,13 +18,13 @@
*/
package org.apache.jackrabbit.oak.segment.file.tar;
-import static org.apache.jackrabbit.guava.common.collect.Lists.newArrayList;
import static java.util.Collections.singletonList;
import static org.apache.jackrabbit.oak.segment.file.tar.GCGeneration.newGCGeneration;
import java.io.Closeable;
import java.io.File;
import java.io.IOException;
+import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
@@ -86,7 +86,7 @@ public class TarReader implements Closeable {
SortedMap<Character, String> sorted = new TreeMap<>();
sorted.putAll(files);
- List<String> list = newArrayList(sorted.values());
+ List<String> list = new ArrayList<>(sorted.values());
Collections.reverse(list);
TarReader reader = openFirstFileWithValidIndex(list, archiveManager);
diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
index 0ef8858bdb..521c85b9d8 100644
--- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
+++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
@@ -2952,7 +2952,7 @@ public final class DocumentNodeStore
setRoot(newHead);
commitQueue.headRevisionChanged();
- store.createOrUpdate(NODES, Lists.newArrayList(updates.values()));
+ store.createOrUpdate(NODES, new ArrayList<>(updates.values()));
numUpdates.addAndGet(updates.size());
LOG.debug("Background sweep2 updated {}", updates.keySet());
}
@@ -3074,7 +3074,7 @@ public final class DocumentNodeStore
setRoot(newHead);
commitQueue.headRevisionChanged();
- store.createOrUpdate(NODES, Lists.newArrayList(updates.values()));
+ store.createOrUpdate(NODES, new ArrayList<>(updates.values()));
numUpdates.addAndGet(updates.size());
LOG.debug("Background sweep updated {}", updates.keySet());
}
diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/LastRevRecoveryAgent.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/LastRevRecoveryAgent.java
index 0417435e60..d91ee545ad 100644
--- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/LastRevRecoveryAgent.java
+++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/LastRevRecoveryAgent.java
@@ -316,7 +316,7 @@ public class LastRevRecoveryAgent {
sweepRev.set(Utils.max(sweepRev.get(), jRev));
// now that journal entry is in place, perform the actual
// updates on the documents
- store.createOrUpdate(NODES, newArrayList(updates.values()));
+ store.createOrUpdate(NODES, new ArrayList<>(updates.values()));
log.info("Sweeper updated {}", updates.keySet());
}
});
diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java
index 8c45e15513..239ac1765e 100644
--- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java
+++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java
@@ -3325,7 +3325,7 @@ public class DocumentNodeStoreTest {
NodeDocument doc = store.find(NODES, Utils.getIdFromPath("/a/b"));
assertNotNull(doc);
long previousValue = -1;
- List<String> values = Lists.newArrayList(doc.getLocalMap("p").values());
+ List<String> values = new ArrayList<>(doc.getLocalMap("p").values());
for (String v : Lists.reverse(values)) {
long currentValue = Long.parseLong(v);
assertEquals(previousValue + 1, currentValue);
diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeStoreDiffTest.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeStoreDiffTest.java
index 3e63566433..c30cde3396 100644
--- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeStoreDiffTest.java
+++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeStoreDiffTest.java
@@ -16,15 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.jackrabbit.oak.plugins.document;
import java.io.IOException;
+import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import org.apache.jackrabbit.guava.common.collect.Lists;
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.cache.CacheStats;
import org.apache.jackrabbit.oak.commons.PathUtils;
@@ -141,7 +140,7 @@ public class NodeStoreDiffTest {
//rebase was performed
// remember paths accessed so far
- List<String> paths = Lists.newArrayList(tds.paths);
+ List<String> paths = new ArrayList<>(tds.paths);
//This is not to be done in actual cases as CommitHooks are invoked in critical sections
//and creating nodes from within CommitHooks would cause deadlock. This is done here to ensure
diff --git a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeStore.java b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeStore.java
index 84938212f3..dee31d5f53 100644
--- a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeStore.java
+++ b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeStore.java
@@ -25,6 +25,7 @@ import static org.apache.jackrabbit.oak.plugins.memory.ModifiedNodeState.squeeze
import java.io.Closeable;
import java.io.IOException;
import java.io.InputStream;
+import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
@@ -32,7 +33,6 @@ import java.util.Set;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicReference;
-import org.apache.jackrabbit.guava.common.collect.Lists;
import org.apache.jackrabbit.guava.common.collect.Maps;
import org.apache.jackrabbit.guava.common.io.ByteStreams;
@@ -224,7 +224,7 @@ public class MemoryNodeStore implements NodeStore, Observable {
@NotNull
@Override
public synchronized Iterable<String> checkpoints() {
- return Lists.newArrayList(checkpoints.keySet());
+ return new ArrayList<>(checkpoints.keySet());
}
@Override @Nullable
diff --git a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MultiPropertyState.java b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MultiPropertyState.java
index 7ecf43bd64..d7540e5de2 100644
--- a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MultiPropertyState.java
+++ b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MultiPropertyState.java
@@ -20,6 +20,7 @@ package org.apache.jackrabbit.oak.plugins.memory;
import static org.apache.jackrabbit.oak.commons.conditions.Validate.checkArgument;
+import java.util.ArrayList;
import java.util.List;
import javax.jcr.PropertyType;
diff --git a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/PropertyBuilder.java b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/PropertyBuilder.java
index 5d6458917f..d1abbce349 100644
--- a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/PropertyBuilder.java
+++ b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/PropertyBuilder.java
@@ -133,7 +133,7 @@ public class PropertyBuilder<T> {
@NotNull
public List<T> getValues() {
- return Lists.newArrayList(values);
+ return new ArrayList<>(values);
}
public T getValue(int index) {