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 da...@apache.org on 2024/09/12 12:34:38 UTC
(jackrabbit-oak) 01/01: OAK-11103 : replaced Lists.newArrayListWithCapacity with new ArrayList<>(initialCapacity)
This is an automated email from the ASF dual-hosted git repository.
daim pushed a commit to branch OAK-11103
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit dc3b9486251bd6aa965165d2e7a02081875d7654
Author: Rishabh Kumar <di...@adobe.com>
AuthorDate: Thu Sep 12 18:04:22 2024 +0530
OAK-11103 : replaced Lists.newArrayListWithCapacity with new ArrayList<>(initialCapacity)
---
.../suites/ScalabilityBlobSearchSuite.java | 4 +-
.../scalability/suites/ScalabilityNodeSuite.java | 4 +-
.../apache/jackrabbit/oak/spi/mount/Mounts.java | 5 +-
.../jackrabbit/oak/plugins/index/IndexUpdate.java | 8 +-
.../oak/plugins/nodetype/EffectiveType.java | 4 +-
.../nodetype/write/NodeTypeTemplateImpl.java | 7 +-
.../oak/plugins/tree/impl/AbstractMutableTree.java | 8 +-
.../oak/plugins/tree/impl/AbstractTree.java | 4 +-
.../oak/query/TraversalAvoidanceTest.java | 4 +-
.../observation/ConsolidatedListenerMBeanImpl.java | 3 +-
.../jackrabbit/oak/jcr/session/ItemImpl.java | 4 +-
.../jackrabbit/oak/jcr/session/NodeImpl.java | 3 +-
.../jackrabbit/oak/jcr/session/PropertyImpl.java | 4 +-
.../oak/jcr/xml/DocViewImportHandler.java | 2 +-
.../oak/jcr/ConcurrentIndexUpdateIT.java | 4 +-
.../oak/plugins/index/lucene/IndexTracker.java | 4 +-
.../plugins/index/lucene/LucenePropertyIndex.java | 3 +-
.../index/lucene/directory/IndexRootDirectory.java | 2 +-
.../plugins/index/lucene/hybrid/DocumentQueue.java | 3 +-
.../oak/plugins/index/lucene/hybrid/NRTIndex.java | 4 +-
.../index/lucene/LucenePropertyIndexTest.java | 121 +++++++++++----------
.../MultiplexingLucenePropertyIndexTest.java | 2 +-
.../index/search/spi/query/FulltextIndex.java | 4 +-
.../search/spi/query/FulltextIndexPlanner.java | 5 +-
.../apache/jackrabbit/oak/spi/xml/PropInfo.java | 4 +-
.../oak/segment/DefaultSegmentWriter.java | 4 +-
.../apache/jackrabbit/oak/segment/ListRecord.java | 4 +-
.../apache/jackrabbit/oak/segment/MapRecord.java | 8 +-
.../jackrabbit/oak/segment/RecordWriters.java | 4 +-
.../jackrabbit/oak/segment/SegmentNodeState.java | 7 +-
.../jackrabbit/oak/segment/SegmentParser.java | 4 +-
.../oak/segment/SegmentPropertyState.java | 4 +-
.../oak/segment/file/tar/GraphLoader.java | 4 +-
.../jackrabbit/oak/segment/SegmentParserTest.java | 4 +-
.../plugins/index/solr/query/SolrQueryIndex.java | 2 +-
.../oak/plugins/document/RevisionVector.java | 8 +-
.../plugins/document/bundlor/CompositeMatcher.java | 5 +-
.../plugins/document/bundlor/DocumentBundlor.java | 2 +-
.../oak/plugins/document/bundlor/Include.java | 4 +-
.../apache/jackrabbit/oak/json/JsonSerializer.java | 5 +-
.../jackrabbit/oak/spi/commit/CompositeEditor.java | 9 +-
.../oak/spi/commit/CompositeEditorProvider.java | 5 +-
.../oak/upgrade/JackrabbitNodeState.java | 28 ++---
.../jackrabbit/oak/upgrade/RepositoryUpgrade.java | 6 +-
44 files changed, 170 insertions(+), 167 deletions(-)
diff --git a/oak-benchmarks-lucene/src/main/java/org/apache/jackrabbit/oak/scalability/suites/ScalabilityBlobSearchSuite.java b/oak-benchmarks-lucene/src/main/java/org/apache/jackrabbit/oak/scalability/suites/ScalabilityBlobSearchSuite.java
index 770a45853c..f2d542e966 100644
--- a/oak-benchmarks-lucene/src/main/java/org/apache/jackrabbit/oak/scalability/suites/ScalabilityBlobSearchSuite.java
+++ b/oak-benchmarks-lucene/src/main/java/org/apache/jackrabbit/oak/scalability/suites/ScalabilityBlobSearchSuite.java
@@ -19,8 +19,8 @@
package org.apache.jackrabbit.oak.scalability.suites;
import static org.apache.jackrabbit.guava.common.collect.Lists.newArrayList;
-import static org.apache.jackrabbit.guava.common.collect.Lists.newArrayListWithCapacity;
+import java.util.ArrayList;
import java.util.List;
import java.util.Random;
import java.util.concurrent.TimeUnit;
@@ -167,7 +167,7 @@ public class ScalabilityBlobSearchSuite extends ScalabilityNodeSuite {
// recreate paths created in this run
searchPaths = newArrayList();
- readPaths = newArrayListWithCapacity(READERS);
+ readPaths = new ArrayList<>(READERS);
// create the blob load for this iteration
createLoad(context);
diff --git a/oak-benchmarks-lucene/src/main/java/org/apache/jackrabbit/oak/scalability/suites/ScalabilityNodeSuite.java b/oak-benchmarks-lucene/src/main/java/org/apache/jackrabbit/oak/scalability/suites/ScalabilityNodeSuite.java
index 3d4af5c722..e80a1b3bd4 100644
--- a/oak-benchmarks-lucene/src/main/java/org/apache/jackrabbit/oak/scalability/suites/ScalabilityNodeSuite.java
+++ b/oak-benchmarks-lucene/src/main/java/org/apache/jackrabbit/oak/scalability/suites/ScalabilityNodeSuite.java
@@ -19,8 +19,8 @@
package org.apache.jackrabbit.oak.scalability.suites;
import static org.apache.jackrabbit.guava.common.collect.Lists.newArrayList;
-import static org.apache.jackrabbit.guava.common.collect.Lists.newArrayListWithCapacity;
+import java.util.ArrayList;
import java.util.Calendar;
import java.util.List;
import java.util.Map;
@@ -410,7 +410,7 @@ public class ScalabilityNodeSuite extends ScalabilityAbstractSuite {
context.startProfiler();
}
//Execute the benchmark with the number threads configured
- List<Thread> threads = newArrayListWithCapacity(TESTERS);
+ List<Thread> threads = new ArrayList<>(TESTERS);
for (int idx = 0; idx < TESTERS; idx++) {
Thread t = new Thread("Tester-" + idx) {
@Override
diff --git a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/mount/Mounts.java b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/mount/Mounts.java
index c47730004a..587f536a03 100644
--- a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/mount/Mounts.java
+++ b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/mount/Mounts.java
@@ -19,8 +19,7 @@
package org.apache.jackrabbit.oak.spi.mount;
-import org.apache.jackrabbit.guava.common.collect.Lists;
-
+import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
@@ -174,7 +173,7 @@ public final class Mounts {
* Provides a fluent API from creating {@link MountInfoProvider} instances
*/
public static final class Builder {
- private final List<Mount> mounts = Lists.newArrayListWithCapacity(1);
+ private final List<Mount> mounts = new ArrayList<>(1);
private Builder() {
}
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexUpdate.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexUpdate.java
index ee78c7399a..15ac4253b8 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexUpdate.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexUpdate.java
@@ -18,7 +18,6 @@ package org.apache.jackrabbit.oak.plugins.index;
import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.guava.common.collect.Lists.newArrayList;
-import static org.apache.jackrabbit.guava.common.collect.Lists.newArrayListWithCapacity;
import static org.apache.jackrabbit.guava.common.collect.Sets.newIdentityHashSet;
import static org.apache.jackrabbit.oak.api.Type.BOOLEAN;
import static org.apache.jackrabbit.oak.commons.PathUtils.concat;
@@ -38,6 +37,7 @@ import static org.apache.jackrabbit.oak.spi.commit.CompositeEditor.compose;
import static org.apache.jackrabbit.oak.spi.commit.EditorDiff.process;
import static org.apache.jackrabbit.oak.spi.commit.VisibleEditor.wrap;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -496,7 +496,7 @@ public class IndexUpdate implements Editor, PathSource {
@Override @NotNull
public Editor childNodeAdded(String name, NodeState after)
throws CommitFailedException {
- List<Editor> children = newArrayListWithCapacity(1 + editors.size());
+ List<Editor> children = new ArrayList<>(1 + editors.size());
children.add(new IndexUpdate(this, name));
for (Editor editor : editors) {
Editor child = editor.childNodeAdded(name, after);
@@ -511,7 +511,7 @@ public class IndexUpdate implements Editor, PathSource {
public Editor childNodeChanged(
String name, NodeState before, NodeState after)
throws CommitFailedException {
- List<Editor> children = newArrayListWithCapacity(1 + editors.size());
+ List<Editor> children = new ArrayList<>(1 + editors.size());
children.add(new IndexUpdate(this, name));
for (Editor editor : editors) {
Editor child = editor.childNodeChanged(name, before, after);
@@ -525,7 +525,7 @@ public class IndexUpdate implements Editor, PathSource {
@Override @Nullable
public Editor childNodeDeleted(String name, NodeState before)
throws CommitFailedException {
- List<Editor> children = newArrayListWithCapacity(editors.size());
+ List<Editor> children = new ArrayList<>(editors.size());
for (Editor editor : editors) {
Editor child = editor.childNodeDeleted(name, before);
if (child != null) {
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/EffectiveType.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/EffectiveType.java
index 1481cd75d8..f1a6ec07f6 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/EffectiveType.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/EffectiveType.java
@@ -16,6 +16,7 @@
*/
package org.apache.jackrabbit.oak.plugins.nodetype;
+import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -31,7 +32,6 @@ import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.guava.common.collect.Iterables.addAll;
import static org.apache.jackrabbit.guava.common.collect.Iterables.concat;
import static org.apache.jackrabbit.guava.common.collect.Iterables.contains;
-import static org.apache.jackrabbit.guava.common.collect.Lists.newArrayListWithCapacity;
import static org.apache.jackrabbit.JcrConstants.JCR_DEFAULTPRIMARYTYPE;
import static org.apache.jackrabbit.JcrConstants.JCR_MANDATORY;
import static org.apache.jackrabbit.JcrConstants.JCR_MIXINTYPES;
@@ -268,7 +268,7 @@ class EffectiveType {
}
List<String> getDirectTypeNames() {
- List<String> names = newArrayListWithCapacity(types.size());
+ List<String> names = new ArrayList<>(types.size());
for (NodeState type : types) {
names.add(type.getName(JCR_NODETYPENAME));
}
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/NodeTypeTemplateImpl.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/NodeTypeTemplateImpl.java
index 6a38fee91e..a78ff511ce 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/NodeTypeTemplateImpl.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/write/NodeTypeTemplateImpl.java
@@ -32,6 +32,7 @@ import static org.apache.jackrabbit.oak.api.Type.NAME;
import static org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants.JCR_IS_ABSTRACT;
import static org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants.JCR_IS_QUERYABLE;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.function.Predicate;
@@ -99,8 +100,7 @@ class NodeTypeTemplateImpl extends NamedTemplate implements NodeTypeTemplate {
PropertyDefinition[] pds = definition.getDeclaredPropertyDefinitions();
if (pds != null) {
- propertyDefinitionTemplates =
- Lists.newArrayListWithCapacity(pds.length);
+ propertyDefinitionTemplates = new ArrayList<>(pds.length);
for (PropertyDefinition pd : pds) {
propertyDefinitionTemplates.add(
new PropertyDefinitionTemplateImpl(mapper, pd));
@@ -109,8 +109,7 @@ class NodeTypeTemplateImpl extends NamedTemplate implements NodeTypeTemplate {
NodeDefinition[] nds = definition.getDeclaredChildNodeDefinitions();
if (nds != null) {
- nodeDefinitionTemplates =
- Lists.newArrayListWithCapacity(nds.length);
+ nodeDefinitionTemplates = new ArrayList<>(nds.length);
for (NodeDefinition nd : nds) {
nodeDefinitionTemplates.add(
new NodeDefinitionTemplateImpl(mapper, nd));
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/impl/AbstractMutableTree.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/impl/AbstractMutableTree.java
index 0b204c59ca..42b58b99c1 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/impl/AbstractMutableTree.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/impl/AbstractMutableTree.java
@@ -21,10 +21,10 @@ package org.apache.jackrabbit.oak.plugins.tree.impl;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkArgument;
import static java.util.Objects.requireNonNull;
-import static org.apache.jackrabbit.guava.common.collect.Lists.newArrayListWithCapacity;
import static org.apache.jackrabbit.oak.api.Type.NAMES;
import static org.apache.jackrabbit.oak.plugins.tree.TreeConstants.OAK_CHILD_ORDER;
+import java.util.ArrayList;
import java.util.List;
import org.apache.jackrabbit.oak.api.PropertyState;
@@ -52,7 +52,7 @@ public abstract class AbstractMutableTree extends AbstractTree {
NodeBuilder parentBuilder = parent.getNodeBuilder();
PropertyState order = parentBuilder.getProperty(OAK_CHILD_ORDER);
if (order != null) {
- List<String> names = newArrayListWithCapacity(order.count());
+ List<String> names = new ArrayList<>(order.count());
for (String n : order.getValue(NAMES)) {
if (!n.equals(name)) {
names.add(n);
@@ -75,7 +75,7 @@ public abstract class AbstractMutableTree extends AbstractTree {
nodeBuilder.setChildNode(name);
PropertyState order = nodeBuilder.getProperty(OAK_CHILD_ORDER);
if (order != null) {
- List<String> names = newArrayListWithCapacity(order.count() + 1);
+ List<String> names = new ArrayList<>(order.count() + 1);
for (String n : order.getValue(NAMES)) {
if (!n.equals(name)) {
names.add(n);
@@ -123,7 +123,7 @@ public abstract class AbstractMutableTree extends AbstractTree {
}
// perform the reorder
- List<String> names = newArrayListWithCapacity(10000);
+ List<String> names = new ArrayList<>(10000);
NodeBuilder builder = parent.getNodeBuilder();
boolean found = false;
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/impl/AbstractTree.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/impl/AbstractTree.java
index 07eec74425..2f5773e500 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/impl/AbstractTree.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/impl/AbstractTree.java
@@ -23,7 +23,6 @@ import static org.apache.jackrabbit.guava.common.base.Preconditions.checkState;
import static org.apache.jackrabbit.guava.common.collect.Iterables.filter;
import static org.apache.jackrabbit.guava.common.collect.Iterables.size;
import static org.apache.jackrabbit.guava.common.collect.Iterables.transform;
-import static org.apache.jackrabbit.guava.common.collect.Lists.newArrayListWithCapacity;
import static org.apache.jackrabbit.guava.common.collect.Sets.newLinkedHashSet;
import static org.apache.jackrabbit.oak.api.Tree.Status.MODIFIED;
import static org.apache.jackrabbit.oak.api.Tree.Status.NEW;
@@ -31,6 +30,7 @@ import static org.apache.jackrabbit.oak.api.Tree.Status.UNCHANGED;
import static org.apache.jackrabbit.oak.api.Type.NAMES;
import static org.apache.jackrabbit.oak.plugins.tree.TreeConstants.OAK_CHILD_ORDER;
+import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
@@ -128,7 +128,7 @@ public abstract class AbstractTree implements Tree {
PropertyState order = nodeBuilder.getProperty(OAK_CHILD_ORDER);
if (order != null && order.getType() == NAMES) {
Set<String> names = newLinkedHashSet(nodeBuilder.getChildNodeNames());
- List<String> ordered = newArrayListWithCapacity(names.size());
+ List<String> ordered = new ArrayList<>(names.size());
for (String name : order.getValue(NAMES)) {
// only include names of child nodes that actually exist
if (names.remove(name)) {
diff --git a/oak-core/src/test/java/org/apache/jackrabbit/oak/query/TraversalAvoidanceTest.java b/oak-core/src/test/java/org/apache/jackrabbit/oak/query/TraversalAvoidanceTest.java
index 14933b849a..fc39b40057 100644
--- a/oak-core/src/test/java/org/apache/jackrabbit/oak/query/TraversalAvoidanceTest.java
+++ b/oak-core/src/test/java/org/apache/jackrabbit/oak/query/TraversalAvoidanceTest.java
@@ -15,6 +15,7 @@ package org.apache.jackrabbit.oak.query;
import static org.junit.Assert.assertNotNull;
+import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.TimeUnit;
import java.util.function.Predicate;
@@ -44,7 +45,6 @@ import org.junit.Before;
import org.junit.Test;
import org.apache.jackrabbit.guava.common.collect.ImmutableList;
-import org.apache.jackrabbit.guava.common.collect.Lists;
public class TraversalAvoidanceTest extends AbstractQueryTest {
@@ -207,7 +207,7 @@ public class TraversalAvoidanceTest extends AbstractQueryTest {
TestQueryIndex(String name) {
this.name = name;
- plans = Lists.newArrayListWithCapacity(5);
+ plans = new ArrayList<>(5);
}
@Override
diff --git a/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/ConsolidatedListenerMBeanImpl.java b/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/ConsolidatedListenerMBeanImpl.java
index 47bf5a4206..a357c99c15 100644
--- a/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/ConsolidatedListenerMBeanImpl.java
+++ b/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/ConsolidatedListenerMBeanImpl.java
@@ -18,6 +18,7 @@
*/
package org.apache.jackrabbit.oak.jcr.observation;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
@@ -203,7 +204,7 @@ public class ConsolidatedListenerMBeanImpl implements ConsolidatedListenerMBean
* @return map of EventListenerMBean and corresponding Observer
*/
private List<ListenerMBeans> getListenerMBeans() {
- List<ListenerMBeans> mbeans = Lists.newArrayListWithCapacity(eventListeners.size());
+ List<ListenerMBeans> mbeans = new ArrayList<>(eventListeners.size());
for (Map.Entry<ObjectName, EventListenerMBean> e : eventListeners.entrySet()){
String listenerId = getListenerId(e.getKey());
ListenerMBeans m = new ListenerMBeans();
diff --git a/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/ItemImpl.java b/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/ItemImpl.java
index a42b7ec0c7..cd782aa814 100644
--- a/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/ItemImpl.java
+++ b/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/ItemImpl.java
@@ -16,7 +16,6 @@
*/
package org.apache.jackrabbit.oak.jcr.session;
-import static org.apache.jackrabbit.guava.common.collect.Lists.newArrayListWithCapacity;
import static java.lang.String.format;
import static org.apache.jackrabbit.oak.api.Type.NAME;
import static org.apache.jackrabbit.oak.api.Type.NAMES;
@@ -27,6 +26,7 @@ import static org.apache.jackrabbit.oak.api.Type.UNDEFINED;
import static org.apache.jackrabbit.oak.api.Type.UNDEFINEDS;
import static org.apache.jackrabbit.oak.plugins.memory.PropertyStates.createProperty;
+import java.util.ArrayList;
import java.util.List;
import javax.jcr.AccessDeniedException;
@@ -389,7 +389,7 @@ abstract class ItemImpl<T extends ItemDelegate> implements Item {
}
if (type == NAMES || type == PATHS) {
Type<?> base = type.getBaseType();
- List<String> strings = newArrayListWithCapacity(values.size());
+ List<String> strings = new ArrayList<>(values.size());
for (Value value : values) {
strings.add(getOakValue(value, base));
}
diff --git a/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/NodeImpl.java b/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/NodeImpl.java
index f429bae4b8..fc8423f2f8 100644
--- a/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/NodeImpl.java
+++ b/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/NodeImpl.java
@@ -31,6 +31,7 @@ import static org.apache.jackrabbit.oak.plugins.tree.TreeUtil.getNames;
import java.io.InputStream;
import java.math.BigDecimal;
+import java.util.ArrayList;
import java.util.Calendar;
import java.util.Collections;
import java.util.Iterator;
@@ -1477,7 +1478,7 @@ public class NodeImpl<T extends NodeDelegate> extends ItemImpl<T> implements Jac
* @return value list without {@code null} entries
*/
private static List<Value> compact(Value[] values) {
- List<Value> list = Lists.newArrayListWithCapacity(values.length);
+ List<Value> list = new ArrayList<>(values.length);
for (Value value : values) {
if (value != null) {
list.add(value);
diff --git a/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/PropertyImpl.java b/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/PropertyImpl.java
index 3f58fe87f2..a2168d32c8 100644
--- a/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/PropertyImpl.java
+++ b/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/PropertyImpl.java
@@ -16,10 +16,10 @@
*/
package org.apache.jackrabbit.oak.jcr.session;
-import static org.apache.jackrabbit.guava.common.collect.Lists.newArrayListWithCapacity;
import java.io.InputStream;
import java.math.BigDecimal;
+import java.util.ArrayList;
import java.util.Calendar;
import java.util.List;
@@ -509,7 +509,7 @@ public class PropertyImpl extends ItemImpl<PropertyDelegate> implements Property
"This is a single-valued property");
}
- List<Value> converted = newArrayListWithCapacity(values.length);
+ List<Value> converted = new ArrayList<>(values.length);
ValueFactory factory = getValueFactory();
for (Value value : values) {
if (value != null) {
diff --git a/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/DocViewImportHandler.java b/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/DocViewImportHandler.java
index 4971103bb6..d1ebc9a831 100644
--- a/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/DocViewImportHandler.java
+++ b/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/DocViewImportHandler.java
@@ -83,7 +83,7 @@ class DocViewImportHandler extends TargetImportHandler {
*/
private Iterable<String> parseNames(String value) throws SAXException {
String[] names = value.split("\\p{Space}+");
- List<String> qnames = Lists.newArrayListWithCapacity(names.length);
+ List<String> qnames = new ArrayList<>(names.length);
for (String name : names) {
try {
qnames.add(new NameInfo(name).getRepoQualifiedName());
diff --git a/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/ConcurrentIndexUpdateIT.java b/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/ConcurrentIndexUpdateIT.java
index 5dd682fcf7..60b5e390f3 100644
--- a/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/ConcurrentIndexUpdateIT.java
+++ b/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/ConcurrentIndexUpdateIT.java
@@ -96,7 +96,7 @@ public class ConcurrentIndexUpdateIT extends AbstractRepositoryTest {
}
private List<Long> diff(List<Long> after, List<Long> before) {
- List<Long> diff = Lists.newArrayListWithCapacity(after.size());
+ List<Long> diff = new ArrayList<>(after.size());
for (int i = 0; i < after.size(); i++) {
diff.add(after.get(i) - before.get(i));
}
@@ -104,7 +104,7 @@ public class ConcurrentIndexUpdateIT extends AbstractRepositoryTest {
}
private List<Long> currentValues(List<AtomicLong> counters) {
- List<Long> values = Lists.newArrayListWithCapacity(counters.size());
+ List<Long> values = new ArrayList<>(counters.size());
for (AtomicLong v : counters) {
values.add(v.get());
}
diff --git a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexTracker.java b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexTracker.java
index 2270924aa5..e09e687342 100644
--- a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexTracker.java
+++ b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexTracker.java
@@ -17,6 +17,7 @@
package org.apache.jackrabbit.oak.plugins.index.lucene;
import java.io.IOException;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
@@ -49,7 +50,6 @@ import org.slf4j.LoggerFactory;
import static java.util.Objects.requireNonNull;
-import static org.apache.jackrabbit.guava.common.collect.Lists.newArrayListWithCapacity;
import static java.util.Collections.emptyMap;
import static org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexConstants.TYPE_LUCENE;
@@ -162,7 +162,7 @@ public class IndexTracker {
indexPaths.addAll(original.keySet());
indexPaths.addAll(badIndexTracker.getIndexPaths());
- List<Editor> editors = newArrayListWithCapacity(indexPaths.size());
+ List<Editor> editors = new ArrayList<>(indexPaths.size());
for (final String path : indexPaths) {
editors.add(new SubtreeEditor(new DefaultEditor() {
@Override
diff --git a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java
index 78694db3ae..74b9f2d7ee 100644
--- a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java
+++ b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java
@@ -137,7 +137,6 @@ import org.slf4j.LoggerFactory;
import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkState;
-import static org.apache.jackrabbit.guava.common.collect.Lists.newArrayListWithCapacity;
import static org.apache.jackrabbit.JcrConstants.JCR_MIXINTYPES;
import static org.apache.jackrabbit.JcrConstants.JCR_PRIMARYTYPE;
import static org.apache.jackrabbit.oak.api.Type.LONG;
@@ -801,7 +800,7 @@ public class LucenePropertyIndex extends FulltextIndex {
}
sortOrder = removeNativeSort(sortOrder);
- List<SortField> fieldsList = newArrayListWithCapacity(sortOrder.size());
+ List<SortField> fieldsList = new ArrayList<>(sortOrder.size());
PlanResult planResult = getPlanResult(plan);
for (int i = 0; i < sortOrder.size(); i++) {
OrderEntry oe = sortOrder.get(i);
diff --git a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/IndexRootDirectory.java b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/IndexRootDirectory.java
index 6213b5dd8b..07f1c0ed1b 100644
--- a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/IndexRootDirectory.java
+++ b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/IndexRootDirectory.java
@@ -193,7 +193,7 @@ public class IndexRootDirectory {
static String getIndexFolderBaseName(String indexPath) {
List<String> elements = Lists.newArrayList(PathUtils.elements(indexPath));
Collections.reverse(elements);
- List<String> result = Lists.newArrayListWithCapacity(2);
+ List<String> result = new ArrayList<>(2);
//Max 3 nodeNames including oak:index which is the immediate parent for any indexPath
for (String e : Iterables.limit(elements, 3)) {
diff --git a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/DocumentQueue.java b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/DocumentQueue.java
index 2f7252b6d0..b91ac98074 100644
--- a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/DocumentQueue.java
+++ b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/DocumentQueue.java
@@ -22,6 +22,7 @@ package org.apache.jackrabbit.oak.plugins.index.lucene.hybrid;
import java.io.Closeable;
import java.io.IOException;
import java.lang.Thread.UncaughtExceptionHandler;
+import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
@@ -101,7 +102,7 @@ public class DocumentQueue implements Closeable, IndexingQueue {
try {
long start = PERF_LOGGER.start();
int maxSize = docsQueue.size();
- List<LuceneDoc> docs = Lists.newArrayListWithCapacity(maxSize);
+ List<LuceneDoc> docs = new ArrayList<>(maxSize);
ListMultimap<String, LuceneDoc> docsPerIndex = ArrayListMultimap.create();
//Do the processing in batches
diff --git a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/NRTIndex.java b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/NRTIndex.java
index cb9d8c3505..5092f3bbb9 100644
--- a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/NRTIndex.java
+++ b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/NRTIndex.java
@@ -22,6 +22,7 @@ package org.apache.jackrabbit.oak.plugins.index.lucene.hybrid;
import java.io.Closeable;
import java.io.File;
import java.io.IOException;
+import java.util.ArrayList;
import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
@@ -29,7 +30,6 @@ import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.jackrabbit.guava.common.collect.ImmutableList;
-import org.apache.jackrabbit.guava.common.collect.Lists;
import org.apache.commons.io.FileUtils;
import org.apache.jackrabbit.oak.plugins.index.lucene.IndexCopier;
import org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexDefinition;
@@ -159,7 +159,7 @@ public class NRTIndex implements Closeable {
return readers;
}
- List<LuceneIndexReader> newReaders = Lists.newArrayListWithCapacity(2);
+ List<LuceneIndexReader> newReaders = new ArrayList<>(2);
if (latestReader != null) {
newReaders.add(new NRTReader(latestReader, directory));
}
diff --git a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndexTest.java b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndexTest.java
index 82c78d6b92..0f73fe7b68 100644
--- a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndexTest.java
+++ b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndexTest.java
@@ -27,6 +27,7 @@ import java.net.URI;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.text.ParseException;
+import java.util.ArrayList;
import java.util.Calendar;
import java.util.Collection;
import java.util.Collections;
@@ -128,7 +129,15 @@ import static org.apache.jackrabbit.oak.plugins.index.lucene.TestUtil.newNodeAgg
import static org.apache.jackrabbit.oak.plugins.index.lucene.TestUtil.useV2;
import static org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexEditorTest.createCal;
import static org.apache.jackrabbit.oak.plugins.index.property.OrderedIndex.OrderDirection;
-import static org.apache.jackrabbit.oak.plugins.index.search.FulltextIndexConstants.*;
+import static org.apache.jackrabbit.oak.plugins.index.search.FulltextIndexConstants.INCLUDE_PROPERTY_NAMES;
+import static org.apache.jackrabbit.oak.plugins.index.search.FulltextIndexConstants.ORDERED_PROP_NAMES;
+import static org.apache.jackrabbit.oak.plugins.index.search.FulltextIndexConstants.PROP_ANALYZED;
+import static org.apache.jackrabbit.oak.plugins.index.search.FulltextIndexConstants.PROP_NAME;
+import static org.apache.jackrabbit.oak.plugins.index.search.FulltextIndexConstants.PROP_NODE;
+import static org.apache.jackrabbit.oak.plugins.index.search.FulltextIndexConstants.PROP_PROPERTY_INDEX;
+import static org.apache.jackrabbit.oak.plugins.index.search.FulltextIndexConstants.PROP_RANDOM_SEED;
+import static org.apache.jackrabbit.oak.plugins.index.search.FulltextIndexConstants.PROP_REFRESH_DEFN;
+import static org.apache.jackrabbit.oak.plugins.index.search.FulltextIndexConstants.PROP_TYPE;
import static org.apache.jackrabbit.oak.plugins.index.search.IndexDefinition.INDEX_DEFINITION_NODE;
import static org.apache.jackrabbit.oak.plugins.memory.PropertyStates.createProperty;
import static org.apache.jackrabbit.oak.spi.filter.PathFilter.PROP_EXCLUDED_PATHS;
@@ -656,7 +665,7 @@ public class LucenePropertyIndexTest extends AbstractQueryTest {
public void rangeQueriesWithLong() throws Exception {
Tree idx = createIndex("test1", Set.of("propa", "propb"));
Tree propIdx = idx.addChild(PROP_NODE).addChild("propa");
- propIdx.setProperty(FulltextIndexConstants.PROP_TYPE, PropertyType.TYPENAME_LONG);
+ propIdx.setProperty(PROP_TYPE, PropertyType.TYPENAME_LONG);
root.commit();
Tree test = root.getTree("/").addChild("test");
@@ -813,7 +822,7 @@ public class LucenePropertyIndexTest extends AbstractQueryTest {
public void rangeQueriesWithDouble() throws Exception {
Tree idx = createIndex("test1", Set.of("propa", "propb"));
Tree propIdx = idx.addChild(PROP_NODE).addChild("propa");
- propIdx.setProperty(FulltextIndexConstants.PROP_TYPE, PropertyType.TYPENAME_DOUBLE);
+ propIdx.setProperty(PROP_TYPE, PropertyType.TYPENAME_DOUBLE);
root.commit();
Tree test = root.getTree("/").addChild("test");
@@ -862,7 +871,7 @@ public class LucenePropertyIndexTest extends AbstractQueryTest {
public void rangeQueriesWithDate() throws Exception {
Tree idx = createIndex("test1", Set.of("propa", "propb"));
Tree propIdx = idx.addChild(PROP_NODE).addChild("propa");
- propIdx.setProperty(FulltextIndexConstants.PROP_TYPE, PropertyType.TYPENAME_DATE);
+ propIdx.setProperty(PROP_TYPE, PropertyType.TYPENAME_DATE);
root.commit();
Tree test = root.getTree("/").addChild("test");
@@ -1009,7 +1018,7 @@ public class LucenePropertyIndexTest extends AbstractQueryTest {
public void sortQueriesWithLong() throws Exception {
Tree idx = createIndex("test1", Set.of("foo", "bar"));
Tree propIdx = idx.addChild(PROP_NODE).addChild("foo");
- propIdx.setProperty(FulltextIndexConstants.PROP_TYPE, PropertyType.TYPENAME_LONG);
+ propIdx.setProperty(PROP_TYPE, PropertyType.TYPENAME_LONG);
root.commit();
assertSortedLong();
@@ -1021,7 +1030,7 @@ public class LucenePropertyIndexTest extends AbstractQueryTest {
idx.setProperty(createProperty(INCLUDE_PROPERTY_NAMES, Set.of("bar"), STRINGS));
idx.setProperty(createProperty(ORDERED_PROP_NAMES, Set.of("foo"), STRINGS));
Tree propIdx = idx.addChild(PROP_NODE).addChild("foo");
- propIdx.setProperty(FulltextIndexConstants.PROP_TYPE, PropertyType.TYPENAME_LONG);
+ propIdx.setProperty(PROP_TYPE, PropertyType.TYPENAME_LONG);
root.commit();
assertSortedLong();
@@ -1032,7 +1041,7 @@ public class LucenePropertyIndexTest extends AbstractQueryTest {
Tree idx = createIndex("test1", Collections.<String>emptySet());
idx.setProperty(createProperty(ORDERED_PROP_NAMES, Set.of("foo"), STRINGS));
Tree propIdx = idx.addChild(PROP_NODE).addChild("foo");
- propIdx.setProperty(FulltextIndexConstants.PROP_TYPE, PropertyType.TYPENAME_LONG);
+ propIdx.setProperty(PROP_TYPE, PropertyType.TYPENAME_LONG);
root.commit();
assertThat(explain("select [jcr:path] from [nt:base] order by [jcr:score], [foo]"), containsString("lucene:test1"));
@@ -1050,14 +1059,14 @@ public class LucenePropertyIndexTest extends AbstractQueryTest {
Tree idx = createIndex("test1", Collections.<String>emptySet());
idx.setProperty(createProperty(ORDERED_PROP_NAMES, Set.of("foo/bar"), STRINGS));
Tree propIdx = idx.addChild(PROP_NODE).addChild("foo").addChild("bar");
- propIdx.setProperty(FulltextIndexConstants.PROP_TYPE, PropertyType.TYPENAME_LONG);
+ propIdx.setProperty(PROP_TYPE, PropertyType.TYPENAME_LONG);
root.commit();
assertThat(explain("select [jcr:path] from [nt:base] order by [foo/bar]"), containsString("lucene:test1"));
Tree test = root.getTree("/").addChild("test");
List<Long> values = createLongs(NUMBER_OF_NODES);
- List<Tuple> tuples = Lists.newArrayListWithCapacity(values.size());
+ List<Tuple> tuples = new ArrayList<>(values.size());
for(int i = 0; i < values.size(); i++){
Tree child = test.addChild("n"+i);
child.addChild("foo").setProperty("bar", values.get(i));
@@ -1078,7 +1087,7 @@ public class LucenePropertyIndexTest extends AbstractQueryTest {
private List<Tuple> createDataForLongProp() throws CommitFailedException {
Tree test = root.getTree("/").addChild("test");
List<Long> values = createLongs(NUMBER_OF_NODES);
- List<Tuple> tuples = Lists.newArrayListWithCapacity(values.size());
+ List<Tuple> tuples = new ArrayList<>(values.size());
for(int i = 0; i < values.size(); i++){
Tree child = test.addChild("n"+i);
child.setProperty("foo", values.get(i));
@@ -1093,7 +1102,7 @@ public class LucenePropertyIndexTest extends AbstractQueryTest {
public void sortQueriesWithDouble() throws Exception {
Tree idx = createIndex("test1", Set.of("foo", "bar"));
Tree propIdx = idx.addChild(PROP_NODE).addChild("foo");
- propIdx.setProperty(FulltextIndexConstants.PROP_TYPE, PropertyType.TYPENAME_DOUBLE);
+ propIdx.setProperty(PROP_TYPE, PropertyType.TYPENAME_DOUBLE);
root.commit();
assertSortedDouble();
@@ -1105,7 +1114,7 @@ public class LucenePropertyIndexTest extends AbstractQueryTest {
idx.setProperty(createProperty(INCLUDE_PROPERTY_NAMES, Set.of("bar"), STRINGS));
idx.setProperty(createProperty(ORDERED_PROP_NAMES, Set.of("foo"), STRINGS));
Tree propIdx = idx.addChild(PROP_NODE).addChild("foo");
- propIdx.setProperty(FulltextIndexConstants.PROP_TYPE, PropertyType.TYPENAME_DOUBLE);
+ propIdx.setProperty(PROP_TYPE, PropertyType.TYPENAME_DOUBLE);
root.commit();
assertSortedDouble();
@@ -1114,7 +1123,7 @@ public class LucenePropertyIndexTest extends AbstractQueryTest {
void assertSortedDouble() throws CommitFailedException {
Tree test = root.getTree("/").addChild("test");
List<Double> values = createDoubles(NUMBER_OF_NODES);
- List<Tuple> tuples = Lists.newArrayListWithCapacity(values.size());
+ List<Tuple> tuples = new ArrayList<>(values.size());
for(int i = 0; i < values.size(); i++){
Tree child = test.addChild("n"+i);
child.setProperty("foo", values.get(i));
@@ -1159,7 +1168,7 @@ public class LucenePropertyIndexTest extends AbstractQueryTest {
Tree test = root.getTree("/").addChild("test");
List<String> values = createStrings(NUMBER_OF_NODES);
- List<Tuple> tuples = Lists.newArrayListWithCapacity(values.size());
+ List<Tuple> tuples = new ArrayList<>(values.size());
for(int i = 0; i < values.size(); i++){
Tree child = test.addChild("n" + i);
child.setProperty("foo", values.get(i));
@@ -1183,7 +1192,7 @@ public class LucenePropertyIndexTest extends AbstractQueryTest {
void assertSortedString() throws CommitFailedException {
Tree test = root.getTree("/").addChild("test");
List<String> values = createStrings(NUMBER_OF_NODES);
- List<Tuple> tuples = Lists.newArrayListWithCapacity(values.size());
+ List<Tuple> tuples = new ArrayList<>(values.size());
for(int i = 0; i < values.size(); i++){
Tree child = test.addChild("n"+i);
child.setProperty("foo", values.get(i));
@@ -1202,7 +1211,7 @@ public class LucenePropertyIndexTest extends AbstractQueryTest {
public void sortQueriesWithDate() throws Exception {
Tree idx = createIndex("test1", Set.of("foo", "bar"));
Tree propIdx = idx.addChild(PROP_NODE).addChild("foo");
- propIdx.setProperty(FulltextIndexConstants.PROP_TYPE, PropertyType.TYPENAME_DATE);
+ propIdx.setProperty(PROP_TYPE, PropertyType.TYPENAME_DATE);
root.commit();
assertSortedDate();
@@ -1214,7 +1223,7 @@ public class LucenePropertyIndexTest extends AbstractQueryTest {
idx.setProperty(createProperty(INCLUDE_PROPERTY_NAMES, Set.of("bar"), STRINGS));
idx.setProperty(createProperty(ORDERED_PROP_NAMES, Set.of("foo"), STRINGS));
Tree propIdx = idx.addChild(PROP_NODE).addChild("foo");
- propIdx.setProperty(FulltextIndexConstants.PROP_TYPE, PropertyType.TYPENAME_DATE);
+ propIdx.setProperty(PROP_TYPE, PropertyType.TYPENAME_DATE);
root.commit();
assertSortedDate();
@@ -1223,7 +1232,7 @@ public class LucenePropertyIndexTest extends AbstractQueryTest {
void assertSortedDate() throws ParseException, CommitFailedException {
Tree test = root.getTree("/").addChild("test");
List<Calendar> values = createDates(NUMBER_OF_NODES);
- List<Tuple> tuples = Lists.newArrayListWithCapacity(values.size());
+ List<Tuple> tuples = new ArrayList<>(values.size());
for(int i = 0; i < values.size(); i++){
Tree child = test.addChild("n"+i);
child.setProperty("foo", values.get(i));
@@ -1245,12 +1254,12 @@ public class LucenePropertyIndexTest extends AbstractQueryTest {
idx.setProperty(createProperty(INCLUDE_PROPERTY_NAMES, Set.of("bar"), STRINGS));
idx.setProperty(createProperty(ORDERED_PROP_NAMES, Set.of("foo"), STRINGS));
Tree propIdx = idx.addChild(PROP_NODE).addChild("foo");
- propIdx.setProperty(FulltextIndexConstants.PROP_TYPE, PropertyType.TYPENAME_DATE);
+ propIdx.setProperty(PROP_TYPE, PropertyType.TYPENAME_DATE);
root.commit();
Tree test = root.getTree("/").addChild("test");
List<Calendar> values = createDates(NUMBER_OF_NODES);
- List<Tuple> tuples = Lists.newArrayListWithCapacity(values.size());
+ List<Tuple> tuples = new ArrayList<>(values.size());
for(int i = 0; i < values.size(); i++){
Tree child = test.addChild("n"+i);
child.setProperty("bar", "baz");
@@ -1279,14 +1288,14 @@ public class LucenePropertyIndexTest extends AbstractQueryTest {
Tree idx = createIndex("test1", Set.of("foo", "bar", "baz"));
idx.setProperty(createProperty(ORDERED_PROP_NAMES, Set.of("foo", "baz"), STRINGS));
Tree propIdx = idx.addChild(PROP_NODE).addChild("baz");
- propIdx.setProperty(FulltextIndexConstants.PROP_TYPE, PropertyType.TYPENAME_LONG);
+ propIdx.setProperty(PROP_TYPE, PropertyType.TYPENAME_LONG);
root.commit();
Tree test = root.getTree("/").addChild("test");
int firstPropSize = 5;
List<String> values = createStrings(firstPropSize);
List<Long> longValues = createLongs(NUMBER_OF_NODES);
- List<Tuple2> tuples = Lists.newArrayListWithCapacity(values.size());
+ List<Tuple2> tuples = new ArrayList<>(values.size());
Random r = new Random();
for(int i = 0; i < values.size(); i++){
String val = values.get(r.nextInt(firstPropSize));
@@ -1311,15 +1320,15 @@ public class LucenePropertyIndexTest extends AbstractQueryTest {
// property definition for index test1
Tree propA = propNode.addChild("propa");
- propA.setProperty(FulltextIndexConstants.PROP_TYPE, PropertyType.TYPENAME_STRING);
+ propA.setProperty(PROP_TYPE, PropertyType.TYPENAME_STRING);
propA.setProperty(FulltextIndexConstants.FIELD_BOOST, 2.0);
Tree propB = propNode.addChild("propb");
- propB.setProperty(FulltextIndexConstants.PROP_TYPE, PropertyType.TYPENAME_STRING);
+ propB.setProperty(PROP_TYPE, PropertyType.TYPENAME_STRING);
propB.setProperty(FulltextIndexConstants.FIELD_BOOST, 1.0);
Tree propC = propNode.addChild("propc");
- propC.setProperty(FulltextIndexConstants.PROP_TYPE, PropertyType.TYPENAME_STRING);
+ propC.setProperty(PROP_TYPE, PropertyType.TYPENAME_STRING);
propC.setProperty(FulltextIndexConstants.FIELD_BOOST, 4.0);
root.commit();
@@ -1764,7 +1773,7 @@ public class LucenePropertyIndexTest extends AbstractQueryTest {
// property definition for index test1
Tree propA = propNode.addChild("propa");
- propA.setProperty(FulltextIndexConstants.PROP_TYPE, PropertyType.TYPENAME_STRING);
+ propA.setProperty(PROP_TYPE, PropertyType.TYPENAME_STRING);
propA.setProperty(FulltextIndexConstants.FIELD_BOOST, 2.0);
root.commit();
@@ -1877,12 +1886,12 @@ public class LucenePropertyIndexTest extends AbstractQueryTest {
Tree props = TestUtil.newRulePropTree(idx, TestUtil.NT_TEST);
Tree prop = props.addChild(TestUtil.unique("prop"));
prop.setProperty(FulltextIndexConstants.PROP_NAME, "jcr:title");
- prop.setProperty(FulltextIndexConstants.PROP_PROPERTY_INDEX, true);
+ prop.setProperty(PROP_PROPERTY_INDEX, true);
Tree prop1 = props.addChild(TestUtil.unique("prop"));
prop1.setProperty(FulltextIndexConstants.PROP_NAME, "original/jcr:content/type");
prop1.setProperty(FulltextIndexConstants.PROP_EXCLUDE_FROM_AGGREGATE, true);
- prop1.setProperty(FulltextIndexConstants.PROP_PROPERTY_INDEX, true);
+ prop1.setProperty(PROP_PROPERTY_INDEX, true);
newNodeAggregator(idx)
.newRuleWithName(NT_FILE, newArrayList(JCR_CONTENT, JCR_CONTENT + "/*"))
@@ -1915,11 +1924,11 @@ public class LucenePropertyIndexTest extends AbstractQueryTest {
Tree props = TestUtil.newRulePropTree(idx, TestUtil.NT_TEST);
Tree prop = props.addChild(TestUtil.unique("prop"));
prop.setProperty(FulltextIndexConstants.PROP_NAME, "jcr:title");
- prop.setProperty(FulltextIndexConstants.PROP_PROPERTY_INDEX, true);
+ prop.setProperty(PROP_PROPERTY_INDEX, true);
Tree prop1 = props.addChild(TestUtil.unique("prop"));
prop1.setProperty(FulltextIndexConstants.PROP_NAME, "original/jcr:content/type");
- prop1.setProperty(FulltextIndexConstants.PROP_PROPERTY_INDEX, true);
+ prop1.setProperty(PROP_PROPERTY_INDEX, true);
newNodeAggregator(idx)
.newRuleWithName(NT_FILE, newArrayList(JCR_CONTENT, JCR_CONTENT + "/*"))
@@ -1951,7 +1960,7 @@ public class LucenePropertyIndexTest extends AbstractQueryTest {
Tree props = TestUtil.newRulePropTree(idx, "mix:title");
Tree prop = props.addChild(TestUtil.unique("prop"));
prop.setProperty(FulltextIndexConstants.PROP_NAME, "jcr:title");
- prop.setProperty(FulltextIndexConstants.PROP_PROPERTY_INDEX, true);
+ prop.setProperty(PROP_PROPERTY_INDEX, true);
root.commit();
Tree test = root.getTree("/").addChild("test");
@@ -1971,7 +1980,7 @@ public class LucenePropertyIndexTest extends AbstractQueryTest {
Tree props = TestUtil.newRulePropTree(idx, "mix:mimeType");
Tree prop = props.addChild(TestUtil.unique("prop"));
prop.setProperty(FulltextIndexConstants.PROP_NAME, "jcr:mimeType");
- prop.setProperty(FulltextIndexConstants.PROP_PROPERTY_INDEX, true);
+ prop.setProperty(PROP_PROPERTY_INDEX, true);
root.commit();
Tree test = root.getTree("/").addChild("test");
@@ -1999,8 +2008,8 @@ public class LucenePropertyIndexTest extends AbstractQueryTest {
Tree props = TestUtil.newRulePropTree(idx, "nt:base");
Tree prop = props.addChild(TestUtil.unique("jcr:mimeType"));
prop.setProperty(FulltextIndexConstants.PROP_NAME, "jcr:mimeType");
- prop.setProperty(FulltextIndexConstants.PROP_PROPERTY_INDEX, true);
- prop.setProperty(FulltextIndexConstants.PROP_ANALYZED, true);
+ prop.setProperty(PROP_PROPERTY_INDEX, true);
+ prop.setProperty(PROP_ANALYZED, true);
root.commit();
Tree test = root.getTree("/").addChild("test");
@@ -2039,8 +2048,8 @@ public class LucenePropertyIndexTest extends AbstractQueryTest {
Tree props = TestUtil.newRulePropTree(idx, "nt:base");
Tree prop = props.addChild(TestUtil.unique("text"));
prop.setProperty(FulltextIndexConstants.PROP_NAME, "text");
- prop.setProperty(FulltextIndexConstants.PROP_PROPERTY_INDEX, true);
- prop.setProperty(FulltextIndexConstants.PROP_ANALYZED, true);
+ prop.setProperty(PROP_PROPERTY_INDEX, true);
+ prop.setProperty(PROP_ANALYZED, true);
root.commit();
Tree test = root.getTree("/").addChild("test");
@@ -2063,11 +2072,11 @@ public class LucenePropertyIndexTest extends AbstractQueryTest {
Tree props = TestUtil.newRulePropTree(idx, "mix:title");
Tree prop1 = props.addChild(TestUtil.unique("prop"));
prop1.setProperty(FulltextIndexConstants.PROP_NAME, "jcr:title");
- prop1.setProperty(FulltextIndexConstants.PROP_PROPERTY_INDEX, true);
+ prop1.setProperty(PROP_PROPERTY_INDEX, true);
Tree prop2 = props.addChild(TestUtil.unique("prop"));
prop2.setProperty(FulltextIndexConstants.PROP_NAME, "jcr:content/type");
- prop2.setProperty(FulltextIndexConstants.PROP_PROPERTY_INDEX, true);
+ prop2.setProperty(PROP_PROPERTY_INDEX, true);
root.commit();
Tree test = root.getTree("/").addChild("test");
@@ -2093,7 +2102,7 @@ public class LucenePropertyIndexTest extends AbstractQueryTest {
Tree props = TestUtil.newRulePropTree(idx, "mix:title");
Tree prop1 = props.addChild(TestUtil.unique("prop"));
prop1.setProperty(FulltextIndexConstants.PROP_NAME, "jcr:title");
- prop1.setProperty(FulltextIndexConstants.PROP_PROPERTY_INDEX, true);
+ prop1.setProperty(PROP_PROPERTY_INDEX, true);
root.commit();
// force CoR
@@ -2118,7 +2127,7 @@ public class LucenePropertyIndexTest extends AbstractQueryTest {
Tree props = TestUtil.newRulePropTree(idx, "nt:base");
Tree prop1 = props.addChild(TestUtil.unique("prop"));
prop1.setProperty(FulltextIndexConstants.PROP_NAME, "jcr:title");
- prop1.setProperty(FulltextIndexConstants.PROP_PROPERTY_INDEX, true);
+ prop1.setProperty(PROP_PROPERTY_INDEX, true);
root.commit();
//Make some changes such incremental indexing happens
@@ -2152,7 +2161,7 @@ public class LucenePropertyIndexTest extends AbstractQueryTest {
Tree props = TestUtil.newRulePropTree(idx, "nt:base");
Tree prop1 = props.addChild(TestUtil.unique("prop"));
prop1.setProperty(FulltextIndexConstants.PROP_NAME, "tag");
- prop1.setProperty(FulltextIndexConstants.PROP_ANALYZED, true);
+ prop1.setProperty(PROP_ANALYZED, true);
root.commit();
Tree test = root.getTree("/").addChild("test");
@@ -2184,7 +2193,7 @@ public class LucenePropertyIndexTest extends AbstractQueryTest {
Tree props = TestUtil.newRulePropTree(idx, "nt:base");
Tree prop1 = props.addChild(TestUtil.unique("prop"));
prop1.setProperty(FulltextIndexConstants.PROP_NAME, "jcr:content/metadata/comment");
- prop1.setProperty(FulltextIndexConstants.PROP_ANALYZED, true);
+ prop1.setProperty(PROP_ANALYZED, true);
root.commit();
Tree test = root.getTree("/").addChild("test");
@@ -2264,7 +2273,7 @@ public class LucenePropertyIndexTest extends AbstractQueryTest {
Tree idx = createIndex("test1", Set.of("propa", "propb"));
Tree props = TestUtil.newRulePropTree(idx, "nt:base");
Tree prop1 = props.addChild(TestUtil.unique("prop"));
- prop1.setProperty(FulltextIndexConstants.PROP_PROPERTY_INDEX, true);
+ prop1.setProperty(PROP_PROPERTY_INDEX, true);
prop1.setProperty(FulltextIndexConstants.PROP_NAME, "tag");
prop1.setProperty(FulltextIndexConstants.PROP_INDEX, true);
prop1.setProperty(LuceneIndexConstants.PROP_USE_IN_SUGGEST, true);
@@ -2442,12 +2451,12 @@ public class LucenePropertyIndexTest extends AbstractQueryTest {
assertThat(explain(query), not(containsString("/oak:index/test1")));
//Instead of reindex just refresh the index definition so that new index definition gets picked up
- root.getTree("/oak:index/test1").setProperty(FulltextIndexConstants.PROP_REFRESH_DEFN, true);
+ root.getTree("/oak:index/test1").setProperty(PROP_REFRESH_DEFN, true);
root.commit();
//Plan would reflect new defintion
assertThat(explain(query), containsString("/oak:index/test1"));
- assertFalse(root.getTree("/oak:index/test1").hasProperty(FulltextIndexConstants.PROP_REFRESH_DEFN));
+ assertFalse(root.getTree("/oak:index/test1").hasProperty(PROP_REFRESH_DEFN));
//However as reindex was not done query would result in empty set
assertPlanAndQuery(query, "/oak:index/test1", Collections.<String>emptyList());
@@ -3231,8 +3240,8 @@ public class LucenePropertyIndexTest extends AbstractQueryTest {
Tree props = TestUtil.newRulePropTree(indexDefn, "oak:Unstructured");
Tree prop = props.addChild(TestUtil.unique("prop"));
prop.setProperty(FulltextIndexConstants.PROP_NAME, propName);
- prop.setProperty(FulltextIndexConstants.PROP_PROPERTY_INDEX, true);
- prop.setProperty(FulltextIndexConstants.PROP_ANALYZED, true);
+ prop.setProperty(PROP_PROPERTY_INDEX, true);
+ prop.setProperty(PROP_ANALYZED, true);
prop.setProperty(FulltextIndexConstants.PROP_NODE_SCOPE_INDEX, true);
prop.setProperty(FulltextIndexConstants.FIELD_BOOST, boost);
return prop;
@@ -3281,7 +3290,7 @@ public class LucenePropertyIndexTest extends AbstractQueryTest {
def.setProperty(TYPE_PROPERTY_NAME, LuceneIndexConstants.TYPE_LUCENE);
def.setProperty(REINDEX_PROPERTY_NAME, true);
def.setProperty(FulltextIndexConstants.FULL_TEXT_ENABLED, false);
- def.setProperty(PropertyStates.createProperty(FulltextIndexConstants.INCLUDE_PROPERTY_NAMES, propNames, Type.STRINGS));
+ def.setProperty(PropertyStates.createProperty(INCLUDE_PROPERTY_NAMES, propNames, Type.STRINGS));
def.setProperty(LuceneIndexConstants.SAVE_DIR_LISTING, true);
return index.getChild(INDEX_DEFINITIONS_NAME).getChild(name);
}
@@ -3296,10 +3305,10 @@ public class LucenePropertyIndexTest extends AbstractQueryTest {
Tree props = def.addChild(FulltextIndexConstants.INDEX_RULES)
.addChild("nt:base")
- .addChild(FulltextIndexConstants.PROP_NODE)
+ .addChild(PROP_NODE)
.addChild("allProps");
- props.setProperty(FulltextIndexConstants.PROP_ANALYZED, true);
+ props.setProperty(PROP_ANALYZED, true);
props.setProperty(FulltextIndexConstants.PROP_NODE_SCOPE_INDEX, true);
props.setProperty(FulltextIndexConstants.PROP_USE_IN_EXCERPT, true);
props.setProperty(FulltextIndexConstants.PROP_NAME, FulltextIndexConstants.REGEX_ALL_PROPS);
@@ -3317,7 +3326,7 @@ public class LucenePropertyIndexTest extends AbstractQueryTest {
} else {
Collections.sort(tuples);
}
- List<String> paths = Lists.newArrayListWithCapacity(tuples.size());
+ List<String> paths = new ArrayList<>(tuples.size());
for (Tuple t : tuples) {
paths.add(t.path);
}
@@ -3326,7 +3335,7 @@ public class LucenePropertyIndexTest extends AbstractQueryTest {
static List<String> getSortedPaths(List<Tuple2> tuples) {
Collections.sort(tuples);
- List<String> paths = Lists.newArrayListWithCapacity(tuples.size());
+ List<String> paths = new ArrayList<>(tuples.size());
for (Tuple2 t : tuples) {
paths.add(t.path);
}
@@ -3334,7 +3343,7 @@ public class LucenePropertyIndexTest extends AbstractQueryTest {
}
static List<Long> createLongs(int n){
- List<Long> values = Lists.newArrayListWithCapacity(n);
+ List<Long> values = new ArrayList<>(n);
for (long i = 0; i < n; i++){
values.add(i);
}
@@ -3344,7 +3353,7 @@ public class LucenePropertyIndexTest extends AbstractQueryTest {
private static List<Double> createDoubles(int n){
Random rnd = new Random();
- List<Double> values = Lists.newArrayListWithCapacity(n);
+ List<Double> values = new ArrayList<>(n);
for (long i = 0; i < n; i++){
values.add(rnd.nextDouble());
}
@@ -3353,7 +3362,7 @@ public class LucenePropertyIndexTest extends AbstractQueryTest {
}
static List<String> createStrings(int n){
- List<String> values = Lists.newArrayListWithCapacity(n);
+ List<String> values = new ArrayList<>(n);
for (long i = 0; i < n; i++){
values.add(String.format("value%04d",i));
}
@@ -3363,7 +3372,7 @@ public class LucenePropertyIndexTest extends AbstractQueryTest {
private static List<Calendar> createDates(int n) throws ParseException {
Random rnd = new Random();
- List<Calendar> values = Lists.newArrayListWithCapacity(n);
+ List<Calendar> values = new ArrayList<>(n);
for (long i = 0; i < n; i++){
values.add(createCal(String.format("%02d/%02d/2%03d", rnd.nextInt(26) + 1, rnd.nextInt(10) + 1,i)));
}
diff --git a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/MultiplexingLucenePropertyIndexTest.java b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/MultiplexingLucenePropertyIndexTest.java
index 5ccf03285c..2864cff8ee 100644
--- a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/MultiplexingLucenePropertyIndexTest.java
+++ b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/MultiplexingLucenePropertyIndexTest.java
@@ -250,7 +250,7 @@ public class MultiplexingLucenePropertyIndexTest extends AbstractQueryTest {
int firstPropSize = 25;
List<String> values = LucenePropertyIndexTest.createStrings(firstPropSize);
List<Long> longValues = LucenePropertyIndexTest.createLongs(LucenePropertyIndexTest.NUMBER_OF_NODES);
- List<LucenePropertyIndexTest.Tuple2> tuples = Lists.newArrayListWithCapacity(values.size());
+ List<LucenePropertyIndexTest.Tuple2> tuples = new ArrayList<>(values.size());
Random r = new Random();
Tree libs = createPath("/libs");
Tree content = createPath("/content");
diff --git a/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/query/FulltextIndex.java b/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/query/FulltextIndex.java
index c2c175639a..b679033c09 100644
--- a/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/query/FulltextIndex.java
+++ b/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/query/FulltextIndex.java
@@ -18,7 +18,6 @@
*/
package org.apache.jackrabbit.oak.plugins.index.search.spi.query;
-import org.apache.jackrabbit.guava.common.collect.Lists;
import org.apache.jackrabbit.guava.common.primitives.Chars;
import org.apache.jackrabbit.oak.api.PropertyValue;
import org.apache.jackrabbit.oak.api.Result.SizePrecision;
@@ -51,6 +50,7 @@ import org.slf4j.LoggerFactory;
import javax.jcr.PropertyType;
import java.io.IOException;
+import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
@@ -120,7 +120,7 @@ public abstract class FulltextIndex implements AdvancedQueryIndex, QueryIndex, N
if (filterReplacedIndexes()) {
indexPaths = IndexName.filterReplacedIndexes(indexPaths, rootState, runIsActiveIndexCheck());
}
- List<IndexPlan> plans = Lists.newArrayListWithCapacity(indexPaths.size());
+ List<IndexPlan> plans = new ArrayList<>(indexPaths.size());
for (String path : indexPaths) {
IndexNode indexNode = null;
try {
diff --git a/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/query/FulltextIndexPlanner.java b/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/query/FulltextIndexPlanner.java
index 0ec36f6a75..4bdf805e7c 100644
--- a/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/query/FulltextIndexPlanner.java
+++ b/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/query/FulltextIndexPlanner.java
@@ -61,7 +61,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import static org.apache.jackrabbit.guava.common.collect.Lists.newArrayList;
-import static org.apache.jackrabbit.guava.common.collect.Lists.newArrayListWithCapacity;
import static org.apache.jackrabbit.JcrConstants.JCR_SCORE;
import static org.apache.jackrabbit.JcrConstants.NT_BASE;
@@ -197,7 +196,7 @@ public class FulltextIndexPlanner {
return getNativeFunctionPlanBuilder(indexingRule.getBaseNodeType());
}
- List<String> indexedProps = newArrayListWithCapacity(filter.getPropertyRestrictions().size());
+ List<String> indexedProps = new ArrayList<>(filter.getPropertyRestrictions().size());
for (PropertyDefinition functionIndex : indexingRule.getFunctionRestrictions()) {
for (PropertyRestriction pr : filter.getPropertyRestrictions()) {
@@ -935,7 +934,7 @@ public class FulltextIndexPlanner {
return Collections.emptyList();
}
- List<OrderEntry> orderEntries = newArrayListWithCapacity(sortOrder.size());
+ List<OrderEntry> orderEntries = new ArrayList<>(sortOrder.size());
for (OrderEntry o : sortOrder) {
PropertyDefinition pd = rule.getConfig(o.getPropertyName());
if (pd != null
diff --git a/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/xml/PropInfo.java b/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/xml/PropInfo.java
index 9e63a4e321..8451aa1a55 100644
--- a/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/xml/PropInfo.java
+++ b/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/xml/PropInfo.java
@@ -16,6 +16,7 @@
*/
package org.apache.jackrabbit.oak.spi.xml;
+import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -25,7 +26,6 @@ import javax.jcr.Value;
import javax.jcr.nodetype.PropertyDefinition;
import org.apache.jackrabbit.guava.common.collect.ImmutableList;
-import org.apache.jackrabbit.guava.common.collect.Lists;
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.plugins.memory.PropertyStates;
import org.jetbrains.annotations.NotNull;
@@ -163,7 +163,7 @@ public class PropInfo {
if (values.isEmpty()) {
return Collections.emptyList();
} else {
- List<Value> vs = Lists.newArrayListWithCapacity(values.size());
+ List<Value> vs = new ArrayList<>(values.size());
for (TextValue value : values) {
vs.add(value.getValue(targetType));
}
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 dcf5afca1b..970cc0b141 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
@@ -32,7 +32,6 @@ import static org.apache.jackrabbit.guava.common.base.Preconditions.checkPositio
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkState;
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.newArrayListWithCapacity;
import static org.apache.jackrabbit.guava.common.collect.Lists.newArrayListWithExpectedSize;
import static org.apache.jackrabbit.guava.common.collect.Lists.partition;
import static org.apache.jackrabbit.guava.common.io.ByteStreams.read;
@@ -52,6 +51,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.SequenceInputStream;
import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.HashMap;
@@ -345,7 +345,7 @@ public class DefaultSegmentWriter implements SegmentWriter {
private RecordId writeMapBranch(int level, int size, MapRecord... buckets) throws IOException {
checkElementIndex(size, MapRecord.MAX_SIZE);
int bitmap = 0;
- List<RecordId> bucketIds = newArrayListWithCapacity(buckets.length);
+ List<RecordId> bucketIds = new ArrayList<>(buckets.length);
for (int i = 0; i < buckets.length; i++) {
if (buckets[i] != null) {
bitmap |= 1L << i;
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/ListRecord.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/ListRecord.java
index cf71497b8f..02fd5c9add 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/ListRecord.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/ListRecord.java
@@ -21,10 +21,10 @@ package org.apache.jackrabbit.oak.segment;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkArgument;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkElementIndex;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkPositionIndexes;
-import static org.apache.jackrabbit.guava.common.collect.Lists.newArrayListWithCapacity;
import static java.util.Collections.emptyList;
import static java.util.Collections.singletonList;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -88,7 +88,7 @@ class ListRecord extends Record {
} else if (count == 1) {
return singletonList(getEntry(index));
} else {
- List<RecordId> ids = newArrayListWithCapacity(count);
+ List<RecordId> ids = new ArrayList<>(count);
getEntries(index, count, ids);
return ids;
}
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/MapRecord.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/MapRecord.java
index 777927aab0..13a03cd091 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/MapRecord.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/MapRecord.java
@@ -23,9 +23,9 @@ import static java.lang.Integer.highestOneBit;
import static java.lang.Integer.numberOfTrailingZeros;
import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.guava.common.collect.Iterables.concat;
-import static org.apache.jackrabbit.guava.common.collect.Lists.newArrayListWithCapacity;
import static org.apache.jackrabbit.oak.segment.MapEntry.newMapEntry;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.Iterator;
@@ -154,7 +154,7 @@ public class MapRecord extends Record {
}
private List<MapRecord> getBucketList(Segment segment) {
- List<MapRecord> buckets = newArrayListWithCapacity(BUCKETS_PER_LEVEL);
+ List<MapRecord> buckets = new ArrayList<>(BUCKETS_PER_LEVEL);
int bitmap = segment.readInt(getRecordNumber(), 4);
int ids = 0;
for (int i = 0; i < BUCKETS_PER_LEVEL; i++) {
@@ -325,7 +325,7 @@ public class MapRecord extends Record {
if (isBranch(size, level)) {
List<MapRecord> buckets = getBucketList(segment);
List<Iterable<String>> keys =
- newArrayListWithCapacity(buckets.size());
+ new ArrayList<>(buckets.size());
for (final MapRecord bucket : buckets) {
keys.add(new Iterable<String>() {
@NotNull
@@ -375,7 +375,7 @@ public class MapRecord extends Record {
if (isBranch(size, level)) {
List<MapRecord> buckets = getBucketList(segment);
List<Iterable<MapEntry>> entries =
- newArrayListWithCapacity(buckets.size());
+ new ArrayList<>(buckets.size());
for (final MapRecord bucket : buckets) {
entries.add(new Iterable<MapEntry>() {
@NotNull
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordWriters.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordWriters.java
index baf31a206d..8d18af38e6 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordWriters.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordWriters.java
@@ -19,7 +19,6 @@
package org.apache.jackrabbit.oak.segment;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkArgument;
-import static org.apache.jackrabbit.guava.common.collect.Lists.newArrayListWithCapacity;
import static java.util.Arrays.sort;
import static java.util.Collections.singleton;
import static org.apache.jackrabbit.oak.segment.MapRecord.SIZE_BITS;
@@ -36,6 +35,7 @@ import static org.apache.jackrabbit.oak.segment.Segment.RECORD_ID_BYTES;
import static org.apache.jackrabbit.oak.segment.Segment.SMALL_LIMIT;
import java.io.IOException;
+import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
@@ -164,7 +164,7 @@ final class RecordWriters {
}
private static List<RecordId> extractIds(Collection<MapEntry> entries) {
- List<RecordId> ids = newArrayListWithCapacity(2 * entries.size());
+ List<RecordId> ids = new ArrayList<>(2 * entries.size());
for (MapEntry entry : entries) {
ids.add(entry.getKey());
ids.add(entry.getValue());
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeState.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeState.java
index 05bddc420d..bbefcc3741 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeState.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeState.java
@@ -23,7 +23,6 @@ import static java.util.Collections.singletonList;
import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkArgument;
import static org.apache.jackrabbit.guava.common.base.Suppliers.memoize;
-import static org.apache.jackrabbit.guava.common.collect.Lists.newArrayListWithCapacity;
import static org.apache.jackrabbit.JcrConstants.JCR_MIXINTYPES;
import static org.apache.jackrabbit.JcrConstants.JCR_PRIMARYTYPE;
import static org.apache.jackrabbit.oak.api.Type.BOOLEAN;
@@ -36,6 +35,7 @@ import static org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState.EMPTY_NODE
import static org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState.MISSING_NODE;
import static org.apache.jackrabbit.oak.spi.state.AbstractNodeState.checkValidName;
+import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.UUID;
@@ -253,8 +253,7 @@ public class SegmentNodeState extends Record implements NodeState {
readStats.mark();
Template template = getTemplate();
PropertyTemplate[] propertyTemplates = template.getPropertyTemplates();
- List<PropertyState> list =
- newArrayListWithCapacity(propertyTemplates.length + 2);
+ List<PropertyState> list = new ArrayList<>(propertyTemplates.length + 2);
PropertyState primaryType = template.getPrimaryType();
if (primaryType != null) {
@@ -410,7 +409,7 @@ public class SegmentNodeState extends Record implements NodeState {
return singletonList(reader.readString(id));
}
- List<String> values = newArrayListWithCapacity(size);
+ List<String> values = new ArrayList<>(size);
ListRecord list = new ListRecord(id, size);
for (RecordId value : list.getEntries()) {
values.add(reader.readString(value));
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentParser.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentParser.java
index 981d609b96..de7e5adfd3 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentParser.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentParser.java
@@ -23,7 +23,6 @@ import static java.util.Collections.singletonList;
import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkArgument;
import static org.apache.jackrabbit.guava.common.collect.Lists.newArrayList;
-import static org.apache.jackrabbit.guava.common.collect.Lists.newArrayListWithCapacity;
import static org.apache.jackrabbit.oak.api.Type.BINARY;
import static org.apache.jackrabbit.oak.segment.ListRecord.LEVEL_SIZE;
import static org.apache.jackrabbit.oak.segment.Segment.MEDIUM_LIMIT;
@@ -35,6 +34,7 @@ import static org.apache.jackrabbit.oak.segment.Template.MANY_CHILD_NODES;
import static org.apache.jackrabbit.oak.segment.Template.ZERO_CHILD_NODES;
import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
import java.util.List;
import org.apache.jackrabbit.oak.api.Type;
@@ -759,7 +759,7 @@ public class SegmentParser {
entries = singletonList(listId);
return new ListBucketInfo(listId, true, entries, RECORD_ID_BYTES);
} else if (bucketSize == 1) {
- entries = newArrayListWithCapacity(count);
+ entries = new ArrayList<>(count);
for (int i = 0; i < count; i++) {
entries.add(segment.readRecordId(listId.getRecordNumber(), 0, index + i));
}
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentPropertyState.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentPropertyState.java
index aca06c05f7..54b5c876c4 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentPropertyState.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentPropertyState.java
@@ -21,7 +21,6 @@ package org.apache.jackrabbit.oak.segment;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkArgument;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkElementIndex;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkState;
-import static org.apache.jackrabbit.guava.common.collect.Lists.newArrayListWithCapacity;
import static java.util.Collections.emptyList;
import static java.util.Collections.emptyMap;
@@ -41,6 +40,7 @@ import static org.apache.jackrabbit.oak.api.Type.STRING;
import static org.apache.jackrabbit.oak.api.Type.URI;
import static org.apache.jackrabbit.oak.api.Type.WEAKREFERENCE;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -151,7 +151,7 @@ public class SegmentPropertyState extends Record implements PropertyState {
return (T) singletonList(getValue(values.getEntry(0), type.getBaseType()));
} else {
Type<?> base = type.getBaseType();
- List<Object> list = newArrayListWithCapacity(values.size());
+ List<Object> list = new ArrayList<>(values.size());
for (RecordId id : values.getEntries()) {
list.add(getValue(id, base));
}
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/GraphLoader.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/GraphLoader.java
index c1abd081a2..6837ffe583 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/GraphLoader.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/GraphLoader.java
@@ -18,11 +18,11 @@
*/
package org.apache.jackrabbit.oak.segment.file.tar;
-import static org.apache.jackrabbit.guava.common.collect.Lists.newArrayListWithCapacity;
import static org.apache.jackrabbit.guava.common.collect.Maps.newHashMapWithExpectedSize;
import static org.apache.jackrabbit.oak.segment.file.tar.TarConstants.GRAPH_MAGIC;
import java.io.IOException;
+import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.UUID;
@@ -100,7 +100,7 @@ public final class GraphLoader {
long lsb = buffer.getLong();
int nVertices = buffer.getInt();
- List<UUID> vertices = newArrayListWithCapacity(nVertices);
+ List<UUID> vertices = new ArrayList<>(nVertices);
for (int j = 0; j < nVertices; j++) {
long vMsb = buffer.getLong();
diff --git a/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentParserTest.java b/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentParserTest.java
index 8b70d20442..56f90bf52d 100644
--- a/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentParserTest.java
+++ b/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentParserTest.java
@@ -19,7 +19,6 @@
package org.apache.jackrabbit.oak.segment;
import static org.apache.jackrabbit.guava.common.collect.Lists.newArrayList;
-import static org.apache.jackrabbit.guava.common.collect.Lists.newArrayListWithCapacity;
import static org.apache.jackrabbit.oak.api.Type.BINARY;
import static org.apache.jackrabbit.oak.api.Type.LONGS;
@@ -42,6 +41,7 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import java.io.IOException;
+import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.List;
@@ -427,7 +427,7 @@ public class SegmentParserTest {
public void nonEmptyList() throws IOException {
int count = 100000;
Random rnd = new Random();
- List<RecordId> list = newArrayListWithCapacity(count);
+ List<RecordId> list = new ArrayList<>(count);
for (int k = 0; k < count; k++) {
list.add(writer.writeString("string " + rnd.nextLong()));
}
diff --git a/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndex.java b/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndex.java
index 46d0c17a98..da827b55e0 100644
--- a/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndex.java
+++ b/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndex.java
@@ -535,7 +535,7 @@ public class SolrQueryIndex implements FulltextQueryIndex, QueryIndex.AdvanceFul
public List<IndexPlan> getPlans(Filter filter, List<OrderEntry> sortOrder, NodeState rootState) {
Collection<String> indexPaths = new SolrIndexLookup(rootState).collectIndexNodePaths(filter);
- List<IndexPlan> plans = Lists.newArrayListWithCapacity(indexPaths.size());
+ List<IndexPlan> plans = new ArrayList<>(indexPaths.size());
log.debug("looking for plans for paths : {}", indexPaths);
for (String path : indexPaths) {
diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/RevisionVector.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/RevisionVector.java
index 194d4d0adb..9107736898 100644
--- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/RevisionVector.java
+++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/RevisionVector.java
@@ -16,6 +16,7 @@
*/
package org.apache.jackrabbit.oak.plugins.document;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.Comparator;
import java.util.Iterator;
@@ -37,7 +38,6 @@ import org.slf4j.LoggerFactory;
import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.guava.common.collect.Iterables.toArray;
import static org.apache.jackrabbit.guava.common.collect.Iterators.peekingIterator;
-import static org.apache.jackrabbit.guava.common.collect.Lists.newArrayListWithCapacity;
import static java.util.Arrays.sort;
/**
@@ -175,7 +175,7 @@ public final class RevisionVector implements Iterable<Revision>, Comparable<Revi
}
}
int capacity = Math.min(revisions.length, vector.revisions.length);
- List<Revision> pmin = newArrayListWithCapacity(capacity);
+ List<Revision> pmin = new ArrayList<>(capacity);
PeekingIterator<Revision> it = peekingIterator(vector.iterator());
for (Revision r : revisions) {
Revision other = peekRevision(it, r.getClusterId());
@@ -206,7 +206,7 @@ public final class RevisionVector implements Iterable<Revision>, Comparable<Revi
}
}
int capacity = Math.max(revisions.length, vector.revisions.length);
- List<Revision> pmax = newArrayListWithCapacity(capacity);
+ List<Revision> pmax = new ArrayList<>(capacity);
PeekingIterator<Revision> it = peekingIterator(vector.iterator());
for (Revision r : revisions) {
while (it.hasNext() && it.peek().getClusterId() < r.getClusterId()) {
@@ -235,7 +235,7 @@ public final class RevisionVector implements Iterable<Revision>, Comparable<Revi
* @return the difference of the two vectors.
*/
public RevisionVector difference(RevisionVector vector) {
- List<Revision> diff = newArrayListWithCapacity(revisions.length);
+ List<Revision> diff = new ArrayList<>(revisions.length);
PeekingIterator<Revision> it = peekingIterator(vector.iterator());
for (Revision r : revisions) {
Revision other = peekRevision(it, r.getClusterId());
diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/bundlor/CompositeMatcher.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/bundlor/CompositeMatcher.java
index 10fff3759a..22ee82feb0 100644
--- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/bundlor/CompositeMatcher.java
+++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/bundlor/CompositeMatcher.java
@@ -19,10 +19,9 @@
package org.apache.jackrabbit.oak.plugins.document.bundlor;
+import java.util.ArrayList;
import java.util.List;
-import org.apache.jackrabbit.guava.common.collect.Lists;
-
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkArgument;
class CompositeMatcher implements Matcher {
@@ -52,7 +51,7 @@ class CompositeMatcher implements Matcher {
@Override
public Matcher next(String name) {
- List<Matcher> nextSet = Lists.newArrayListWithCapacity(matchers.size());
+ List<Matcher> nextSet = new ArrayList<>(matchers.size());
for (Matcher current : matchers){
Matcher next = current.next(name);
if (next.isMatch()){
diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/bundlor/DocumentBundlor.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/bundlor/DocumentBundlor.java
index 3545b371c5..a53c5b4469 100644
--- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/bundlor/DocumentBundlor.java
+++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/bundlor/DocumentBundlor.java
@@ -117,7 +117,7 @@ public class DocumentBundlor {
}
public Matcher createMatcher(){
- List<Matcher> matchers = Lists.newArrayListWithCapacity(includes.size());
+ List<Matcher> matchers = new ArrayList<>(includes.size());
for(Include include : includes){
matchers.add(include.createMatcher());
}
diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/bundlor/Include.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/bundlor/Include.java
index f75bacc5ba..5fea58f80e 100644
--- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/bundlor/Include.java
+++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/bundlor/Include.java
@@ -19,10 +19,10 @@
package org.apache.jackrabbit.oak.plugins.document.bundlor;
+import java.util.ArrayList;
import java.util.List;
import org.apache.jackrabbit.guava.common.collect.ImmutableList;
-import org.apache.jackrabbit.guava.common.collect.Lists;
import org.apache.jackrabbit.oak.commons.PathUtils;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkElementIndex;
@@ -54,7 +54,7 @@ public class Include {
public Include(String pattern){
List<String> pathElements = ImmutableList.copyOf(PathUtils.elements(pattern));
- List<String> elementList = Lists.newArrayListWithCapacity(pathElements.size());
+ List<String> elementList = new ArrayList<>(pathElements.size());
Directive directive = Directive.NONE;
for (int i = 0; i < pathElements.size(); i++) {
String e = pathElements.get(i);
diff --git a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/json/JsonSerializer.java b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/json/JsonSerializer.java
index e214f3880b..d2faccb15a 100644
--- a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/json/JsonSerializer.java
+++ b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/json/JsonSerializer.java
@@ -25,7 +25,7 @@ import static org.apache.jackrabbit.oak.api.Type.LONG;
import static org.apache.jackrabbit.oak.api.Type.NAMES;
import static org.apache.jackrabbit.oak.api.Type.STRING;
-import java.util.Collection;
+import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.regex.Pattern;
@@ -34,7 +34,6 @@ import org.jetbrains.annotations.NotNull;
import javax.jcr.PropertyType;
import org.apache.jackrabbit.guava.common.collect.ImmutableList;
-import org.apache.jackrabbit.guava.common.collect.Lists;
import org.apache.jackrabbit.oak.commons.json.JsopBuilder;
import org.apache.jackrabbit.oak.api.Blob;
import org.apache.jackrabbit.oak.api.PropertyState;
@@ -190,7 +189,7 @@ public class JsonSerializer {
PropertyState order = node.getProperty(":childOrder");
if (order != null) {
List<String> names = ImmutableList.copyOf(order.getValue(NAMES));
- List<ChildNodeEntry> entries = Lists.newArrayListWithCapacity(names.size());
+ List<ChildNodeEntry> entries = new ArrayList<>(names.size());
for (String name : names) {
try {
entries.add(new MemoryChildNodeEntry(name, node.getChildNode(name)));
diff --git a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/CompositeEditor.java b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/CompositeEditor.java
index 82244b9931..d351fe63df 100644
--- a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/CompositeEditor.java
+++ b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/CompositeEditor.java
@@ -25,8 +25,7 @@ import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
-import org.apache.jackrabbit.guava.common.collect.Lists;
-
+import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
@@ -102,7 +101,7 @@ public class CompositeEditor implements Editor {
@Override
public Editor childNodeAdded(String name, NodeState after)
throws CommitFailedException {
- List<Editor> list = Lists.newArrayListWithCapacity(editors.size());
+ List<Editor> list = new ArrayList<>(editors.size());
for (Editor editor : editors) {
Editor child = editor.childNodeAdded(name, after);
if (child != null) {
@@ -116,7 +115,7 @@ public class CompositeEditor implements Editor {
public Editor childNodeChanged(
String name, NodeState before, NodeState after)
throws CommitFailedException {
- List<Editor> list = Lists.newArrayListWithCapacity(editors.size());
+ List<Editor> list = new ArrayList<>(editors.size());
for (Editor editor : editors) {
Editor child = editor.childNodeChanged(name, before, after);
if (child != null) {
@@ -129,7 +128,7 @@ public class CompositeEditor implements Editor {
@Override
public Editor childNodeDeleted(String name, NodeState before)
throws CommitFailedException {
- List<Editor> list = Lists.newArrayListWithCapacity(editors.size());
+ List<Editor> list = new ArrayList<>(editors.size());
for (Editor editor : editors) {
Editor child = editor.childNodeDeleted(name, before);
if (child != null) {
diff --git a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/CompositeEditorProvider.java b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/CompositeEditorProvider.java
index 24b21c8c43..5cd119d063 100644
--- a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/CompositeEditorProvider.java
+++ b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/CompositeEditorProvider.java
@@ -19,6 +19,7 @@ package org.apache.jackrabbit.oak.spi.commit;
import static java.util.Arrays.asList;
import static java.util.Objects.requireNonNull;
+import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
@@ -28,8 +29,6 @@ import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
-import org.apache.jackrabbit.guava.common.collect.Lists;
-
/**
* Aggregation of a list of editor providers into a single provider.
*/
@@ -74,7 +73,7 @@ public class CompositeEditorProvider implements EditorProvider {
public Editor getRootEditor(
NodeState before, NodeState after, NodeBuilder builder,
CommitInfo info) throws CommitFailedException {
- List<Editor> list = Lists.newArrayListWithCapacity(providers.size());
+ List<Editor> list = new ArrayList<>(providers.size());
for (EditorProvider provider : providers) {
Editor editor = provider.getRootEditor(before, after, builder, info);
if (editor != null) {
diff --git a/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/JackrabbitNodeState.java b/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/JackrabbitNodeState.java
index 6ed7d57c30..700762ea7e 100644
--- a/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/JackrabbitNodeState.java
+++ b/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/JackrabbitNodeState.java
@@ -20,7 +20,6 @@ import static org.apache.jackrabbit.guava.common.base.Preconditions.checkArgumen
import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkState;
import static org.apache.jackrabbit.guava.common.collect.Iterables.addAll;
-import static org.apache.jackrabbit.guava.common.collect.Lists.newArrayListWithCapacity;
import static org.apache.jackrabbit.guava.common.collect.Maps.newLinkedHashMap;
import static org.apache.jackrabbit.guava.common.collect.Sets.newLinkedHashSet;
@@ -48,6 +47,7 @@ import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.math.BigDecimal;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedHashMap;
@@ -304,7 +304,7 @@ class JackrabbitNodeState extends AbstractNodeState {
@NotNull
@Override
public Iterable<MemoryChildNodeEntry> getChildNodeEntries() {
- List<MemoryChildNodeEntry> entries = newArrayListWithCapacity(nodes.size());
+ List<MemoryChildNodeEntry> entries = new ArrayList<>(nodes.size());
for (Map.Entry<String, NodeId> entry : nodes.entrySet()) {
String name = entry.getKey();
final NodeState child = createChildNodeState(entry.getValue(), name);
@@ -514,73 +514,73 @@ class JackrabbitNodeState extends AbstractNodeState {
throws RepositoryException, IOException {
switch (type) {
case PropertyType.BINARY:
- List<Blob> binaries = newArrayListWithCapacity(values.length);
+ List<Blob> binaries = new ArrayList<>(values.length);
for (InternalValue value : values) {
binaries.add(createBlob(value));
}
return PropertyStates.createProperty(name, binaries, Type.BINARIES);
case PropertyType.BOOLEAN:
- List<Boolean> booleans = newArrayListWithCapacity(values.length);
+ List<Boolean> booleans = new ArrayList<>(values.length);
for (InternalValue value : values) {
booleans.add(value.getBoolean());
}
return PropertyStates.createProperty(name, booleans, Type.BOOLEANS);
case PropertyType.DATE:
- List<String> dates = newArrayListWithCapacity(values.length);
+ List<String> dates = new ArrayList<>(values.length);
for (InternalValue value : values) {
dates.add(value.getString());
}
return PropertyStates.createProperty(name, dates, Type.DATES);
case PropertyType.DECIMAL:
- List<BigDecimal> decimals = newArrayListWithCapacity(values.length);
+ List<BigDecimal> decimals = new ArrayList<>(values.length);
for (InternalValue value : values) {
decimals.add(value.getDecimal());
}
return PropertyStates.createProperty(name, decimals, Type.DECIMALS);
case PropertyType.DOUBLE:
- List<Double> doubles = newArrayListWithCapacity(values.length);
+ List<Double> doubles = new ArrayList<>(values.length);
for (InternalValue value : values) {
doubles.add(value.getDouble());
}
return PropertyStates.createProperty(name, doubles, Type.DOUBLES);
case PropertyType.LONG:
- List<Long> longs = newArrayListWithCapacity(values.length);
+ List<Long> longs = new ArrayList<>(values.length);
for (InternalValue value : values) {
longs.add(value.getLong());
}
return PropertyStates.createProperty(name, longs, Type.LONGS);
case PropertyType.NAME:
- List<String> names = newArrayListWithCapacity(values.length);
+ List<String> names = new ArrayList<>(values.length);
for (InternalValue value : values) {
names.add(createName(value.getName()));
}
return PropertyStates.createProperty(name, names, Type.NAMES);
case PropertyType.PATH:
- List<String> paths = newArrayListWithCapacity(values.length);
+ List<String> paths = new ArrayList<>(values.length);
for (InternalValue value : values) {
paths.add(createPath(value.getPath()));
}
return PropertyStates.createProperty(name, paths, Type.PATHS);
case PropertyType.REFERENCE:
- List<String> references = newArrayListWithCapacity(values.length);
+ List<String> references = new ArrayList<>(values.length);
for (InternalValue value : values) {
references.add(value.getNodeId().toString());
}
return PropertyStates.createProperty(name, references, Type.REFERENCES);
case PropertyType.STRING:
- List<String> strings = newArrayListWithCapacity(values.length);
+ List<String> strings = new ArrayList<>(values.length);
for (InternalValue value : values) {
strings.add(value.getString());
}
return PropertyStates.createProperty(name, strings, Type.STRINGS);
case PropertyType.URI:
- List<String> uris = newArrayListWithCapacity(values.length);
+ List<String> uris = new ArrayList<>(values.length);
for (InternalValue value : values) {
uris.add(value.getURI().toString());
}
return PropertyStates.createProperty(name, uris, Type.URIS);
case PropertyType.WEAKREFERENCE:
- List<String> weakreferences = newArrayListWithCapacity(values.length);
+ List<String> weakreferences = new ArrayList<>(values.length);
for (InternalValue value : values) {
weakreferences.add(value.getNodeId().toString());
}
diff --git a/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositoryUpgrade.java b/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositoryUpgrade.java
index 4bf47a3f34..6f2b473eea 100644
--- a/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositoryUpgrade.java
+++ b/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositoryUpgrade.java
@@ -20,7 +20,6 @@ import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkState;
import static org.apache.jackrabbit.guava.common.collect.ImmutableSet.copyOf;
import static org.apache.jackrabbit.guava.common.collect.Lists.newArrayList;
-import static org.apache.jackrabbit.guava.common.collect.Lists.newArrayListWithCapacity;
import static org.apache.jackrabbit.guava.common.collect.Sets.union;
import static org.apache.jackrabbit.JcrConstants.JCR_SYSTEM;
@@ -36,6 +35,7 @@ import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
import java.util.Calendar;
import java.util.Collection;
import java.util.HashMap;
@@ -850,7 +850,7 @@ public class RepositoryUpgrade {
Name[] supertypes = def.getSupertypes();
if (supertypes != null && supertypes.length > 0) {
- List<String> names = newArrayListWithCapacity(supertypes.length);
+ List<String> names = new ArrayList<>(supertypes.length);
for (Name supertype : supertypes) {
names.add(getOakName(supertype));
}
@@ -886,7 +886,7 @@ public class RepositoryUpgrade {
tmpl.setProtected(def.isProtected());
tmpl.setSameNameSiblings(def.allowsSameNameSiblings());
- List<String> names = newArrayListWithCapacity(def.getRequiredPrimaryTypes().length);
+ List<String> names = new ArrayList<>(def.getRequiredPrimaryTypes().length);
for (Name type : def.getRequiredPrimaryTypes()) {
names.add(getOakName(type));
}