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/25 21:24:57 UTC
(jackrabbit-oak) branch OAK-11228 created (now 36f5a851f0)
This is an automated email from the ASF dual-hosted git repository.
reschke pushed a change to branch OAK-11228
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
at 36f5a851f0 OAK-11228: remove usage of newArrayListWithExpectedSize
This branch includes the following new commits:
new 36f5a851f0 OAK-11228: remove usage of newArrayListWithExpectedSize
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-11228: remove usage of newArrayListWithExpectedSize
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reschke pushed a commit to branch OAK-11228
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit 36f5a851f0cc79f31236510af0dd7922c3fffe9a
Author: Julian Reschke <re...@apache.org>
AuthorDate: Fri Oct 25 22:24:38 2024 +0100
OAK-11228: remove usage of newArrayListWithExpectedSize
---
.../jackrabbit/oak/plugins/blob/datastore/DataStoreBlobStore.java | 8 ++++----
.../security/user/action/DefaultAuthorizableActionProvider.java | 4 ++--
.../org/apache/jackrabbit/oak/segment/DefaultSegmentWriter.java | 5 ++---
3 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreBlobStore.java b/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreBlobStore.java
index 01e1c39242..21c9027257 100644
--- a/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreBlobStore.java
+++ b/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreBlobStore.java
@@ -31,6 +31,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.SequenceInputStream;
import java.net.URI;
+import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.Iterator;
@@ -79,7 +80,6 @@ import org.slf4j.LoggerFactory;
import org.apache.jackrabbit.guava.common.base.Strings;
import org.apache.jackrabbit.guava.common.collect.Iterators;
-import org.apache.jackrabbit.guava.common.collect.Lists;
import org.apache.jackrabbit.guava.common.io.ByteStreams;
import org.apache.jackrabbit.guava.common.io.Closeables;
@@ -530,14 +530,14 @@ public class DataStoreBlobStore
@Override
public boolean deleteChunks(List<String> chunkIds, long maxLastModifiedTime) throws Exception {
return (chunkIds.size() == countDeleteChunks(chunkIds, maxLastModifiedTime));
- }
-
+ }
+
@Override
public long countDeleteChunks(List<String> chunkIds, long maxLastModifiedTime) throws Exception {
int count = 0;
if (delegate instanceof MultiDataStoreAware) {
try {
- List<String> deleted = Lists.newArrayListWithExpectedSize(512);
+ List<String> deleted = new ArrayList<>(512);
for (String chunkId : chunkIds) {
long start = System.nanoTime();
diff --git a/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/user/action/DefaultAuthorizableActionProvider.java b/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/user/action/DefaultAuthorizableActionProvider.java
index 6b81947a8a..ad3102c667 100644
--- a/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/user/action/DefaultAuthorizableActionProvider.java
+++ b/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/user/action/DefaultAuthorizableActionProvider.java
@@ -18,10 +18,10 @@ package org.apache.jackrabbit.oak.spi.security.user.action;
import static org.apache.jackrabbit.oak.spi.security.RegistrationConstants.OAK_SECURITY_NAME;
+import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import org.apache.jackrabbit.guava.common.collect.ImmutableMap;
-import org.apache.jackrabbit.guava.common.collect.Lists;
import org.apache.jackrabbit.oak.spi.security.ConfigurationParameters;
import org.apache.jackrabbit.oak.spi.security.SecurityProvider;
import org.jetbrains.annotations.NotNull;
@@ -104,7 +104,7 @@ public class DefaultAuthorizableActionProvider implements AuthorizableActionProv
@NotNull
@Override
public List<? extends AuthorizableAction> getAuthorizableActions(@NotNull SecurityProvider securityProvider) {
- List<AuthorizableAction> actions = Lists.newArrayListWithExpectedSize(enabledActions.length);
+ List<AuthorizableAction> actions = new ArrayList<>(enabledActions.length);
for (String className : enabledActions) {
try {
Class<? extends AuthorizableAction> cl = SUPPORTED_ACTIONS.get(className);
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 149f588127..de105cc9fd 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
@@ -31,7 +31,6 @@ import static org.apache.jackrabbit.guava.common.base.Preconditions.checkPositio
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkPositionIndexes;
import static org.apache.jackrabbit.guava.common.collect.Iterables.addAll;
import static org.apache.jackrabbit.guava.common.collect.Lists.newArrayList;
-import static org.apache.jackrabbit.guava.common.collect.Lists.newArrayListWithExpectedSize;
import static org.apache.jackrabbit.guava.common.io.ByteStreams.read;
import static org.apache.jackrabbit.oak.api.Type.BINARIES;
import static org.apache.jackrabbit.oak.api.Type.BINARY;
@@ -528,7 +527,7 @@ public class DefaultSegmentWriter implements SegmentWriter {
}
int pos = 0;
- List<RecordId> blockIds = newArrayListWithExpectedSize(
+ List<RecordId> blockIds = new ArrayList<>(
data.length / SegmentStream.BLOCK_SIZE + 1);
// write as many full bulk segments as possible
@@ -684,7 +683,7 @@ public class DefaultSegmentWriter implements SegmentWriter {
n += read(stream, data, n, Segment.MAX_SEGMENT_SIZE - n);
long length = n;
List<RecordId> blockIds =
- newArrayListWithExpectedSize(2 * n / SegmentStream.BLOCK_SIZE);
+ new ArrayList<>(2 * n / SegmentStream.BLOCK_SIZE);
// Write the data to bulk segments and collect the list of block ids
while (n != 0) {