You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by re...@apache.org on 2024/08/08 16:10:43 UTC
(jackrabbit-oak) branch OAK-11010 created (now c1384519a7)
This is an automated email from the ASF dual-hosted git repository.
reschke pushed a change to branch OAK-11010
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
at c1384519a7 OAK-11010: Remove usage of Guava newHashMap
This branch includes the following new commits:
new c1384519a7 OAK-11010: Remove usage of Guava newHashMap
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
(jackrabbit-oak) 01/01: OAK-11010: Remove usage of Guava newHashMap
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reschke pushed a commit to branch OAK-11010
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit c1384519a7fa4457621d775aff46abda4bd46ef2
Author: Julian Reschke <re...@apache.org>
AuthorDate: Thu Aug 8 17:10:23 2024 +0100
OAK-11010: Remove usage of Guava newHashMap
---
.../oak/blob/cloud/s3/S3DataStoreServiceTest.java | 4 ++--
.../oak/spi/whiteboard/DefaultWhiteboard.java | 5 +++--
.../jackrabbit/oak/plugins/cow/BranchNodeStore.java | 2 +-
.../oak/plugins/index/reference/ReferenceEditor.java | 11 ++++++-----
.../apache/jackrabbit/oak/plugins/name/Namespaces.java | 5 +++--
.../org/apache/jackrabbit/oak/query/SQL2Parser.java | 5 ++---
.../oak/plugins/observation/NodeObserverTest.java | 16 ++++++++--------
.../restriction/RestrictionProviderImplTest.java | 8 ++++----
.../plugins/blob/DocumentBlobGCRegistrationTest.java | 5 ++---
.../blob/DocumentBlobTrackerRegistrationTest.java | 5 ++---
.../document/DocumentCachingDataStoreStatsTest.java | 4 ++--
.../oak/segment/SegmentCachingDataStoreStatsTest.java | 4 ++--
.../oak/plugins/index/lucene/IndexTracker.java | 5 +++--
.../plugins/index/lucene/LuceneIndexDefinition.java | 5 ++---
.../apache/jackrabbit/oak/explorer/NodeStoreTree.java | 7 ++++---
.../index/search/spi/query/FulltextIndexPlanner.java | 6 +++---
.../credentials/CompositeCredentialsSupport.java | 4 ++--
.../jackrabbit/oak/segment/CheckpointCompactor.java | 5 +----
.../apache/jackrabbit/oak/segment/CommitsTracker.java | 4 +---
.../jackrabbit/oak/segment/DefaultSegmentWriter.java | 8 ++++----
.../oak/segment/MutableSegmentReferences.java | 5 ++---
.../org/apache/jackrabbit/oak/segment/RecordIdSet.java | 5 ++---
.../oak/segment/SegmentBufferWriterPool.java | 5 +++--
.../jackrabbit/oak/segment/SegmentNodeStore.java | 5 +++--
.../jackrabbit/oak/segment/SegmentPropertyState.java | 5 +++--
.../jackrabbit/oak/segment/file/tar/TarFiles.java | 6 +++---
.../jackrabbit/oak/segment/file/tar/TarWriter.java | 6 +++---
.../oak/segment/DefaultSegmentWriterTest.java | 11 ++++++-----
.../oak/segment/ImmutableRecordNumbersTest.java | 4 +---
.../oak/segment/SegmentBufferMonitorTest.java | 5 ++---
.../jackrabbit/oak/segment/SegmentParserTest.java | 8 ++++----
.../org/apache/jackrabbit/oak/segment/TestUtils.java | 6 ++----
.../jackrabbit/oak/segment/file/tar/TarFileTest.java | 18 +++++++++---------
.../jackrabbit/oak/segment/file/tar/TarFilesTest.java | 1 -
.../jackrabbit/oak/composite/CommitHookEnhancer.java | 6 +++---
.../jackrabbit/oak/composite/CompositeNodeStore.java | 7 ++++---
.../oak/composite/CompositeNodeStoreStats.java | 6 +++---
.../jackrabbit/oak/composite/CompositionContext.java | 5 +++--
.../oak/composite/CrossMountReferenceValidator.java | 5 +++--
.../oak/composite/CompositeChildrenCountTest.java | 5 +++--
.../oak/plugins/document/MissingBcSweeper2.java | 5 +++--
.../oak/plugins/document/NodeDocumentSweeper.java | 5 +++--
.../oak/plugins/document/TestNodeObserver.java | 17 ++++++++---------
.../jackrabbit/oak/plugins/memory/MemoryNodeState.java | 5 ++---
.../jackrabbit/oak/plugins/memory/MemoryNodeStore.java | 7 ++++---
.../oak/plugins/memory/ModifiedNodeState.java | 15 ++++++++-------
.../oak/plugins/memory/MutableNodeState.java | 8 ++++----
.../jackrabbit/oak/spi/commit/ObserverTracker.java | 8 +++-----
.../jackrabbit/oak/upgrade/JackrabbitNodeState.java | 5 +++--
.../jackrabbit/oak/upgrade/RepositoryUpgrade.java | 6 +++---
.../oak/upgrade/cli/parser/DatastoreArguments.java | 4 ++--
51 files changed, 162 insertions(+), 165 deletions(-)
diff --git a/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3DataStoreServiceTest.java b/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3DataStoreServiceTest.java
index 81ec30df47..af6149b6f0 100644
--- a/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3DataStoreServiceTest.java
+++ b/oak-blob-cloud/src/test/java/org/apache/jackrabbit/oak/blob/cloud/s3/S3DataStoreServiceTest.java
@@ -20,6 +20,7 @@ package org.apache.jackrabbit.oak.blob.cloud.s3;
import java.io.File;
import java.io.IOException;
+import java.util.HashMap;
import java.util.Map;
import org.apache.jackrabbit.guava.common.collect.Maps;
@@ -33,7 +34,6 @@ import org.junit.Test;
import org.junit.rules.ExpectedException;
import org.junit.rules.TemporaryFolder;
-import static org.apache.jackrabbit.guava.common.collect.Maps.newHashMap;
import static org.apache.jackrabbit.oak.blob.cloud.s3.S3DataStoreUtils.isS3Configured;
import static org.apache.sling.testing.mock.osgi.MockOsgi.activate;
import static org.apache.sling.testing.mock.osgi.MockOsgi.deactivate;
@@ -77,7 +77,7 @@ public class S3DataStoreServiceTest {
private S3DataStoreService service;
private void registerBlobStore() throws IOException {
- Map<String, Object> properties = newHashMap();
+ Map<String, Object> properties = new HashMap<>();
properties.putAll(Maps.fromProperties(S3DataStoreUtils.getS3Config()));
properties.put("repository.home", folder.newFolder().getAbsolutePath());
service = new S3DataStoreService();
diff --git a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/whiteboard/DefaultWhiteboard.java b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/whiteboard/DefaultWhiteboard.java
index 77e5f95b8a..53676c8d99 100644
--- a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/whiteboard/DefaultWhiteboard.java
+++ b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/whiteboard/DefaultWhiteboard.java
@@ -18,10 +18,11 @@ package org.apache.jackrabbit.oak.spi.whiteboard;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkArgument;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
-import static org.apache.jackrabbit.guava.common.collect.Maps.newHashMap;
+
import static org.apache.jackrabbit.guava.common.collect.Sets.newIdentityHashSet;
import static java.util.Collections.emptyList;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -31,7 +32,7 @@ import org.jetbrains.annotations.NotNull;
public class DefaultWhiteboard implements Whiteboard {
- private final Map<Class<?>, Set<Service>> registry = newHashMap();
+ private final Map<Class<?>, Set<Service>> registry = new HashMap<>();
private synchronized <T> void registered(Class<T> type, Service service) {
Set<Service> services = registry.get(type);
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/cow/BranchNodeStore.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/cow/BranchNodeStore.java
index 84f140812a..9cb9488b88 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/cow/BranchNodeStore.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/cow/BranchNodeStore.java
@@ -43,7 +43,7 @@ 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.newCopyOnWriteArrayList;
import static org.apache.jackrabbit.guava.common.collect.Maps.newConcurrentMap;
-import static org.apache.jackrabbit.guava.common.collect.Maps.newHashMap;
+
import static java.util.Collections.emptyMap;
import static java.util.Collections.singletonMap;
import static java.util.stream.Collectors.toList;
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/reference/ReferenceEditor.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/reference/ReferenceEditor.java
index d9bbb3e610..7d272ce225 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/reference/ReferenceEditor.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/reference/ReferenceEditor.java
@@ -18,7 +18,7 @@ package org.apache.jackrabbit.oak.plugins.index.reference;
import static org.apache.jackrabbit.guava.common.base.Suppliers.memoize;
import static org.apache.jackrabbit.guava.common.collect.ImmutableSet.of;
-import static org.apache.jackrabbit.guava.common.collect.Maps.newHashMap;
+
import static org.apache.jackrabbit.guava.common.collect.Sets.newHashSet;
import static java.util.Collections.emptySet;
import static javax.jcr.PropertyType.REFERENCE;
@@ -34,6 +34,7 @@ import static org.apache.jackrabbit.oak.plugins.index.reference.NodeReferenceCon
import static org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState.MISSING_NODE;
import static org.apache.jackrabbit.oak.spi.version.VersionConstants.VERSION_STORE_PATH;
+import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
@@ -117,10 +118,10 @@ class ReferenceEditor extends DefaultEditor implements IndexEditor {
this.path = "/";
this.definition = definition;
this.root = root;
- this.newRefs = newHashMap();
- this.rmRefs = newHashMap();
- this.newWeakRefs = newHashMap();
- this.rmWeakRefs = newHashMap();
+ this.newRefs = new HashMap<>();
+ this.rmRefs = new HashMap<>();
+ this.newWeakRefs = new HashMap<>();
+ this.rmWeakRefs = new HashMap<>();
this.rmIds = newHashSet();
this.newIds = newHashSet();
this.mountInfoProvider = mountInfoProvider;
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/name/Namespaces.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/name/Namespaces.java
index 6dc4cb15c4..dd7b036337 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/name/Namespaces.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/name/Namespaces.java
@@ -16,6 +16,7 @@
*/
package org.apache.jackrabbit.oak.plugins.name;
+import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
@@ -29,7 +30,7 @@ import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkState;
import static org.apache.jackrabbit.guava.common.collect.Maps.newConcurrentMap;
-import static org.apache.jackrabbit.guava.common.collect.Maps.newHashMap;
+
import static org.apache.jackrabbit.guava.common.collect.Sets.newHashSet;
import static javax.jcr.NamespaceRegistry.NAMESPACE_JCR;
import static javax.jcr.NamespaceRegistry.NAMESPACE_MIX;
@@ -164,7 +165,7 @@ public class Namespaces implements NamespaceConstants {
}
static Map<String, String> collectNamespaces(Iterable<? extends PropertyState> properties) {
- Map<String, String> map = newHashMap();
+ Map<String, String> map = new HashMap<>();
for (PropertyState property : properties) {
String prefix = property.getName();
if (STRING.equals(property.getType()) && isValidPrefix(prefix)) {
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/query/SQL2Parser.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/query/SQL2Parser.java
index e32c8c47b3..3ed8786fe4 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/query/SQL2Parser.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/query/SQL2Parser.java
@@ -17,7 +17,6 @@
package org.apache.jackrabbit.oak.query;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
-import static org.apache.jackrabbit.guava.common.collect.Maps.newHashMap;
import java.math.BigDecimal;
import java.text.ParseException;
@@ -66,7 +65,7 @@ import org.slf4j.LoggerFactory;
* language (here named SQL-1) is also supported.
*/
public class SQL2Parser {
-
+
private static final Logger LOG = LoggerFactory.getLogger(SQL2Parser.class);
// Character types, used during the tokenizer phase
@@ -98,7 +97,7 @@ public class SQL2Parser {
private HashMap<String, BindVariableValueImpl> bindVariables;
// The list of selectors of this query
- private final Map<String, SelectorImpl> selectors = newHashMap();
+ private final Map<String, SelectorImpl> selectors = new HashMap<>();
// SQL injection protection: if disabled, literals are not allowed
private boolean allowTextLiterals = true;
diff --git a/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/observation/NodeObserverTest.java b/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/observation/NodeObserverTest.java
index fa6f9f4776..1fa5949f31 100644
--- a/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/observation/NodeObserverTest.java
+++ b/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/observation/NodeObserverTest.java
@@ -19,12 +19,12 @@
package org.apache.jackrabbit.oak.plugins.observation;
-import static org.apache.jackrabbit.guava.common.collect.Maps.newHashMap;
import static org.apache.jackrabbit.guava.common.collect.Sets.newHashSet;
import static org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState.EMPTY_NODE;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
+import java.util.HashMap;
import java.util.Map;
import java.util.Set;
@@ -132,10 +132,10 @@ public class NodeObserverTest {
//------------------------------------------------------------< TestNodeObserver >---
private static class TestNodeObserver extends NodeObserver {
- private final Map<String, Set<String>> added = newHashMap();
- private final Map<String, Set<String>> deleted = newHashMap();
- private final Map<String, Set<String>> changed = newHashMap();
- private final Map<String, Map<String, String>> properties = newHashMap();
+ private final Map<String, Set<String>> added = new HashMap<>();
+ private final Map<String, Set<String>> deleted = new HashMap<>();
+ private final Map<String, Set<String>> changed = new HashMap<>();
+ private final Map<String, Map<String, String>> properties = new HashMap<>();
protected TestNodeObserver(String path, String... propertyNames) {
super(path, propertyNames);
@@ -151,7 +151,7 @@ public class NodeObserverTest {
@NotNull CommitInfo commitInfo) {
this.added.put(path, newHashSet(added));
if (!properties.isEmpty()) {
- this.properties.put(path, newHashMap(properties));
+ this.properties.put(path, new HashMap<>(properties));
}
}
@@ -165,7 +165,7 @@ public class NodeObserverTest {
@NotNull CommitInfo commitInfo) {
this.deleted.put(path, newHashSet(deleted));
if (!properties.isEmpty()) {
- this.properties.put(path, newHashMap(properties));
+ this.properties.put(path, new HashMap<>(properties));
}
}
@@ -179,7 +179,7 @@ public class NodeObserverTest {
@NotNull CommitInfo commitInfo) {
this.changed.put(path, newHashSet(changed));
if (!properties.isEmpty()) {
- this.properties.put(path, newHashMap(properties));
+ this.properties.put(path, new HashMap<>(properties));
}
}
diff --git a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/restriction/RestrictionProviderImplTest.java b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/restriction/RestrictionProviderImplTest.java
index 67a5db406d..bad4f9abcf 100644
--- a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/restriction/RestrictionProviderImplTest.java
+++ b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/restriction/RestrictionProviderImplTest.java
@@ -49,11 +49,11 @@ import javax.jcr.security.AccessControlManager;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import static org.apache.jackrabbit.guava.common.collect.Maps.newHashMap;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
@@ -131,7 +131,7 @@ public class RestrictionProviderImplTest extends AbstractSecurityTest implements
@Test
public void testGetRestrictionPattern() throws Exception {
- Map<PropertyState, RestrictionPattern> map = newHashMap();
+ Map<PropertyState, RestrictionPattern> map = new HashMap<>();
map.put(PropertyStates.createProperty(REP_GLOB, "/*/jcr:content"), GlobPattern.create("/testPath", "/*/jcr:content"));
List<String> ntNames = ImmutableList.of(JcrConstants.NT_FOLDER, JcrConstants.NT_LINKEDFILE);
map.put(PropertyStates.createProperty(REP_NT_NAMES, ntNames, Type.NAMES), new NodeTypePattern(ntNames));
@@ -159,7 +159,7 @@ public class RestrictionProviderImplTest extends AbstractSecurityTest implements
@Test
public void testGetPatternForAllSupported() throws Exception {
- Map<PropertyState, RestrictionPattern> map = newHashMap();
+ Map<PropertyState, RestrictionPattern> map = new HashMap<>();
String globRestriction = "/*/jcr:content";
map.put(PropertyStates.createProperty(REP_GLOB, globRestriction), GlobPattern.create("/testPath", globRestriction));
List<String> ntNames = ImmutableList.of(JcrConstants.NT_FOLDER, JcrConstants.NT_LINKEDFILE);
@@ -189,7 +189,7 @@ public class RestrictionProviderImplTest extends AbstractSecurityTest implements
public void testGetPatternFromRestrictions() throws Exception {
String globRestriction = "/*/jcr:content";
- Map<PropertyState, RestrictionPattern> map = newHashMap();
+ Map<PropertyState, RestrictionPattern> map = new HashMap<>();
map.put(PropertyStates.createProperty(REP_GLOB, globRestriction), GlobPattern.create("/testPath", globRestriction));
List<String> ntNames = ImmutableList.of(JcrConstants.NT_FOLDER, JcrConstants.NT_LINKEDFILE);
diff --git a/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/blob/DocumentBlobGCRegistrationTest.java b/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/blob/DocumentBlobGCRegistrationTest.java
index 58dc2c8a90..56b5bc5659 100644
--- a/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/blob/DocumentBlobGCRegistrationTest.java
+++ b/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/blob/DocumentBlobGCRegistrationTest.java
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.jackrabbit.oak.plugins.blob;
+import java.util.HashMap;
import java.util.Map;
import org.apache.jackrabbit.oak.plugins.document.DocumentNodeStoreService;
@@ -27,7 +27,6 @@ import org.apache.sling.testing.mock.osgi.MockOsgi;
import org.junit.After;
import org.junit.BeforeClass;
-import static org.apache.jackrabbit.guava.common.collect.Maps.newHashMap;
import static org.junit.Assume.assumeTrue;
/**
@@ -50,7 +49,7 @@ public class DocumentBlobGCRegistrationTest extends AbstractBlobGCRegistrationTe
@Override
protected void registerNodeStoreService() {
- Map<String, Object> properties = newHashMap();
+ Map<String, Object> properties = new HashMap<>();
properties.put(DocumentNodeStoreService.CUSTOM_BLOB_STORE, true);
properties.put("repository.home", repoHome);
properties.put("mongouri", MongoUtils.URL);
diff --git a/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/blob/DocumentBlobTrackerRegistrationTest.java b/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/blob/DocumentBlobTrackerRegistrationTest.java
index 9353181d48..4e6a59b603 100644
--- a/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/blob/DocumentBlobTrackerRegistrationTest.java
+++ b/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/blob/DocumentBlobTrackerRegistrationTest.java
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.jackrabbit.oak.plugins.blob;
+import java.util.HashMap;
import java.util.Map;
import org.apache.jackrabbit.oak.plugins.document.DocumentNodeStoreService;
@@ -28,7 +28,6 @@ import org.junit.After;
import org.junit.Before;
import org.junit.BeforeClass;
-import static org.apache.jackrabbit.guava.common.collect.Maps.newHashMap;
import static org.apache.sling.testing.mock.osgi.MockOsgi.deactivate;
import static org.junit.Assume.assumeTrue;
@@ -59,7 +58,7 @@ public class DocumentBlobTrackerRegistrationTest extends AbstractBlobTrackerRegi
@Override
protected void registerNodeStoreService() {
- Map<String, Object> properties = newHashMap();
+ Map<String, Object> properties = new HashMap<>();
properties.put(DocumentNodeStoreService.CUSTOM_BLOB_STORE, true);
properties.put("repository.home", repoHome);
properties.put("mongouri", MongoUtils.URL);
diff --git a/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentCachingDataStoreStatsTest.java b/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentCachingDataStoreStatsTest.java
index 228f878cb7..1d4114ba3f 100644
--- a/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentCachingDataStoreStatsTest.java
+++ b/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentCachingDataStoreStatsTest.java
@@ -20,6 +20,7 @@ package org.apache.jackrabbit.oak.plugins.document;
import java.io.File;
import java.io.IOException;
+import java.util.HashMap;
import java.util.Map;
import org.apache.jackrabbit.oak.api.jmx.ConsolidatedDataStoreCacheStatsMBean;
@@ -41,7 +42,6 @@ import org.junit.rules.ExpectedException;
import org.junit.rules.TemporaryFolder;
import org.osgi.framework.ServiceRegistration;
-import static org.apache.jackrabbit.guava.common.collect.Maps.newHashMap;
import static org.apache.sling.testing.mock.osgi.MockOsgi.deactivate;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
@@ -123,7 +123,7 @@ public class DocumentCachingDataStoreStatsTest {
private DocumentNodeStoreService documentNodeStoreService;
private void registerDocumentNodeStoreService(boolean customBlobStore) {
- Map<String, Object> properties = newHashMap();
+ Map<String, Object> properties = new HashMap<>();
properties.put("mongouri", MongoUtils.URL);
properties.put("db", MongoUtils.DB);
diff --git a/oak-it/src/test/java/org/apache/jackrabbit/oak/segment/SegmentCachingDataStoreStatsTest.java b/oak-it/src/test/java/org/apache/jackrabbit/oak/segment/SegmentCachingDataStoreStatsTest.java
index 088f32dd20..010b8857f6 100644
--- a/oak-it/src/test/java/org/apache/jackrabbit/oak/segment/SegmentCachingDataStoreStatsTest.java
+++ b/oak-it/src/test/java/org/apache/jackrabbit/oak/segment/SegmentCachingDataStoreStatsTest.java
@@ -18,7 +18,6 @@
*/
package org.apache.jackrabbit.oak.segment;
-import static org.apache.jackrabbit.guava.common.collect.Maps.newHashMap;
import static org.apache.jackrabbit.oak.segment.SegmentNodeStoreService.CUSTOM_BLOB_STORE;
import static org.apache.jackrabbit.oak.segment.SegmentNodeStoreService.REPOSITORY_HOME_DIRECTORY;
import static org.apache.sling.testing.mock.osgi.MockOsgi.deactivate;
@@ -27,6 +26,7 @@ import static org.junit.Assert.assertNull;
import static org.mockito.Mockito.mock;
import java.io.File;
+import java.util.HashMap;
import java.util.Map;
import org.apache.jackrabbit.oak.api.jmx.ConsolidatedDataStoreCacheStatsMBean;
@@ -104,7 +104,7 @@ public class SegmentCachingDataStoreStatsTest {
private SegmentNodeStoreService segmentNodeStoreService;
private void registerSegmentNodeStoreService(boolean customBlobStore) {
- Map<String, Object> properties = newHashMap();
+ Map<String, Object> properties = new HashMap<>();
properties.put(CUSTOM_BLOB_STORE, customBlobStore);
properties.put(REPOSITORY_HOME_DIRECTORY, folder.getRoot().getAbsolutePath());
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 9f80a598b3..2e8caa6c63 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.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -51,7 +52,7 @@ import static org.apache.jackrabbit.guava.common.base.Predicates.in;
import static org.apache.jackrabbit.guava.common.base.Predicates.not;
import static org.apache.jackrabbit.guava.common.collect.Lists.newArrayListWithCapacity;
-import static org.apache.jackrabbit.guava.common.collect.Maps.newHashMap;
+
import static java.util.Collections.emptyMap;
import static org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexConstants.TYPE_LUCENE;
import static org.apache.jackrabbit.oak.plugins.index.lucene.util.LuceneIndexHelper.isLuceneIndexNode;
@@ -157,7 +158,7 @@ public class IndexTracker {
}
Map<String, LuceneIndexNodeManager> original = indices;
- final Map<String, LuceneIndexNodeManager> updates = newHashMap();
+ final Map<String, LuceneIndexNodeManager> updates = new HashMap<>();
Set<String> indexPaths = Sets.newHashSet();
indexPaths.addAll(original.keySet());
diff --git a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexDefinition.java b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexDefinition.java
index 9a9e7317be..486e62eca7 100644
--- a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexDefinition.java
+++ b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexDefinition.java
@@ -16,10 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.jackrabbit.oak.plugins.index.lucene;
import java.util.Collections;
+import java.util.HashMap;
import java.util.Map;
import org.apache.jackrabbit.guava.common.collect.ImmutableMap;
@@ -47,7 +47,6 @@ import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static org.apache.jackrabbit.guava.common.collect.Maps.newHashMap;
import static org.apache.jackrabbit.oak.plugins.index.search.FulltextIndexConstants.ANL_DEFAULT;
import static org.apache.jackrabbit.oak.plugins.index.search.FulltextIndexConstants.INDEX_ORIGINAL_TERM;
import static org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexConstants.VERSION;
@@ -161,7 +160,7 @@ public class LuceneIndexDefinition extends IndexDefinition {
}
private static Map<String, Analyzer> collectAnalyzers(NodeState defn) {
- Map<String, Analyzer> analyzerMap = newHashMap();
+ Map<String, Analyzer> analyzerMap = new HashMap<>();
NodeStateAnalyzerFactory factory = new NodeStateAnalyzerFactory(VERSION);
NodeState analyzersTree = defn.getChildNode(FulltextIndexConstants.ANALYZERS);
for (ChildNodeEntry cne : analyzersTree.getChildNodeEntries()) {
diff --git a/oak-run/src/main/java/org/apache/jackrabbit/oak/explorer/NodeStoreTree.java b/oak-run/src/main/java/org/apache/jackrabbit/oak/explorer/NodeStoreTree.java
index 4281d86ae0..cd72ca31c3 100644
--- a/oak-run/src/main/java/org/apache/jackrabbit/oak/explorer/NodeStoreTree.java
+++ b/oak-run/src/main/java/org/apache/jackrabbit/oak/explorer/NodeStoreTree.java
@@ -19,7 +19,7 @@
package org.apache.jackrabbit.oak.explorer;
import static org.apache.jackrabbit.guava.common.collect.Lists.newArrayList;
-import static org.apache.jackrabbit.guava.common.collect.Maps.newHashMap;
+
import static org.apache.jackrabbit.guava.common.collect.Maps.newTreeMap;
import static org.apache.jackrabbit.guava.common.collect.Sets.intersection;
import static org.apache.jackrabbit.guava.common.collect.Sets.newHashSet;
@@ -38,6 +38,7 @@ import static org.apache.jackrabbit.oak.json.JsopDiff.diffToJsop;
import java.awt.*;
import java.io.Closeable;
import java.io.IOException;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
@@ -160,7 +161,7 @@ class NodeStoreTree extends JPanel implements TreeSelectionListener, Closeable {
private void refreshModel() {
index = backend.getTarReaderIndex();
- sizeCache = newHashMap();
+ sizeCache = new HashMap<>();
DefaultMutableTreeNode rootNode = new DefaultMutableTreeNode(
new NamePathModel("/", "/", backend.getHead(), sizeCache,
skipSizeCheck, backend), true);
@@ -463,7 +464,7 @@ class NodeStoreTree extends JPanel implements TreeSelectionListener, Closeable {
filterNodeStates(newHashSet(id), paths, backend.getHead(), "/", backend);
printPaths(paths, sb);
- Map<UUID, Set<Entry<UUID, String>>> links = newHashMap();
+ Map<UUID, Set<Entry<UUID, String>>> links = new HashMap<>();
try {
backend.getGcRoots(id, links);
} catch (IOException e) {
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 f9d2b81994..f89487a487 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,7 @@ 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.guava.common.collect.Maps.newHashMap;
+
import static org.apache.jackrabbit.JcrConstants.JCR_SCORE;
import static org.apache.jackrabbit.JcrConstants.NT_BASE;
import static org.apache.jackrabbit.oak.commons.PathUtils.getAncestorPath;
@@ -1034,11 +1034,11 @@ public class FulltextIndexPlanner {
private final List<PropertyDefinition> sortedProperties = newArrayList();
//Map of actual property name as present in our property definitions
- private final Map<String, PropertyDefinition> propDefns = newHashMap();
+ private final Map<String, PropertyDefinition> propDefns = new HashMap<>();
//Map of property restriction name -> property definition name
//like 'jcr:content/status' -> 'status'
- private final Map<String, String> relPropMapping = newHashMap();
+ private final Map<String, String> relPropMapping = new HashMap<>();
private boolean nonFullTextConstraints;
private int parentDepth;
diff --git a/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/credentials/CompositeCredentialsSupport.java b/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/credentials/CompositeCredentialsSupport.java
index 2b0adec6c0..8497b3fa64 100644
--- a/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/credentials/CompositeCredentialsSupport.java
+++ b/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/credentials/CompositeCredentialsSupport.java
@@ -17,6 +17,7 @@
package org.apache.jackrabbit.oak.spi.security.authentication.credentials;
import java.util.Collection;
+import java.util.HashMap;
import java.util.Map;
import java.util.Set;
import java.util.function.Supplier;
@@ -26,7 +27,6 @@ import javax.jcr.Credentials;
import org.apache.jackrabbit.guava.common.collect.ImmutableMap;
import org.apache.jackrabbit.guava.common.collect.ImmutableSet;
import static org.apache.jackrabbit.guava.common.collect.Sets.newHashSet;
-import static org.apache.jackrabbit.guava.common.collect.Maps.newHashMap;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -88,7 +88,7 @@ public final class CompositeCredentialsSupport implements CredentialsSupport {
} else if (all.size() == 1) {
return all.iterator().next().getAttributes(credentials);
} else {
- Map<String, Object> attrs = newHashMap();
+ Map<String, Object> attrs = new HashMap<>();
for (CredentialsSupport c : all) {
attrs.putAll(c.getAttributes(credentials));
}
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CheckpointCompactor.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CheckpointCompactor.java
index 2b24d14de4..6b05996141 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CheckpointCompactor.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CheckpointCompactor.java
@@ -15,14 +15,11 @@
* limitations under the License.
*
*/
-
package org.apache.jackrabbit.oak.segment;
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.newArrayList;
-import static org.apache.jackrabbit.guava.common.collect.Maps.newHashMap;
-import static org.apache.jackrabbit.guava.common.collect.Maps.newLinkedHashMap;
+
import static org.apache.jackrabbit.oak.commons.PathUtils.elements;
import static org.apache.jackrabbit.oak.commons.PathUtils.getName;
import static org.apache.jackrabbit.oak.commons.PathUtils.getParentPath;
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CommitsTracker.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CommitsTracker.java
index 5db6e032d5..f580e798d8 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CommitsTracker.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CommitsTracker.java
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.jackrabbit.oak.segment;
-import static org.apache.jackrabbit.guava.common.collect.Maps.newHashMap;
import static org.apache.jackrabbit.guava.common.collect.Queues.newConcurrentLinkedQueue;
import java.lang.ref.WeakReference;
@@ -188,7 +186,7 @@ class CommitsTracker {
}
public Map<String, Long> getCommitsCountPerGroupLastMinute() {
- Map<String, Long> commitsPerGroup = newHashMap();
+ Map<String, Long> commitsPerGroup = new HashMap<>();
long t = System.currentTimeMillis() - 60000;
for (Commit commit : commits) {
if (commit.getQueued() > t) {
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 7e32b57dce..8df1f6ee3a 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
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.jackrabbit.oak.segment;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkArgument;
@@ -30,7 +29,7 @@ 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.collect.Maps.newHashMap;
+
import static org.apache.jackrabbit.guava.common.io.ByteStreams.read;
import static java.lang.Long.numberOfLeadingZeros;
import static java.lang.Math.min;
@@ -55,6 +54,7 @@ import java.io.SequenceInputStream;
import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import java.util.Collection;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -391,7 +391,7 @@ public class DefaultSegmentWriter implements SegmentWriter {
// if the base map is small, update in memory and write as a new map
if (base.isLeaf()) {
- Map<String, MapEntry> map = newHashMap();
+ Map<String, MapEntry> map = new HashMap<>();
for (MapEntry entry : base.getEntries()) {
map.put(entry.getName(), entry);
}
@@ -1037,7 +1037,7 @@ public class DefaultSegmentWriter implements SegmentWriter {
}
private class ChildNodeCollectorDiff extends DefaultNodeStateDiff {
- private final Map<String, RecordId> childNodes = newHashMap();
+ private final Map<String, RecordId> childNodes = new HashMap<>();
@Nullable
private MapRecord base;
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/MutableSegmentReferences.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/MutableSegmentReferences.java
index 52b0b1d9cf..bbb1b83028 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/MutableSegmentReferences.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/MutableSegmentReferences.java
@@ -14,12 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.jackrabbit.oak.segment;
import static org.apache.jackrabbit.guava.common.collect.Lists.newArrayList;
-import static org.apache.jackrabbit.guava.common.collect.Maps.newHashMap;
+import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -35,7 +34,7 @@ class MutableSegmentReferences implements SegmentReferences {
private final List<SegmentId> ids = newArrayList();
- private final Map<SegmentId, Integer> numbers = newHashMap();
+ private final Map<SegmentId, Integer> numbers = new HashMap<>();
@Override
public SegmentId getSegmentId(int reference) {
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordIdSet.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordIdSet.java
index d00733f84e..31e7d7c249 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordIdSet.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordIdSet.java
@@ -16,13 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.jackrabbit.oak.segment;
-import static org.apache.jackrabbit.guava.common.collect.Maps.newHashMap;
import static java.lang.System.arraycopy;
import static java.util.Arrays.binarySearch;
+import java.util.HashMap;
import java.util.Map;
/**
@@ -32,7 +31,7 @@ import java.util.Map;
* it contains.
*/
public class RecordIdSet {
- private final Map<String, IntSet> seenIds = newHashMap();
+ private final Map<String, IntSet> seenIds = new HashMap<>();
/**
* Add {@code id} to this set if not already present
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentBufferWriterPool.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentBufferWriterPool.java
index bdbd1ba567..7c7353b5c0 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentBufferWriterPool.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentBufferWriterPool.java
@@ -22,12 +22,13 @@ import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkState;
import static org.apache.jackrabbit.guava.common.collect.Lists.newArrayList;
import static org.apache.jackrabbit.guava.common.collect.Maps.newConcurrentMap;
-import static org.apache.jackrabbit.guava.common.collect.Maps.newHashMap;
+
import static org.apache.jackrabbit.guava.common.collect.Sets.newHashSet;
import static java.lang.Thread.currentThread;
import java.io.IOException;
import java.util.AbstractMap.SimpleImmutableEntry;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -186,7 +187,7 @@ public abstract class SegmentBufferWriterPool implements WriteOperationHandler {
/**
* Pool of current writers that are not in use
*/
- private final Map<Object, SegmentBufferWriter> writers = newHashMap();
+ private final Map<Object, SegmentBufferWriter> writers = new HashMap<>();
/**
* Writers that are currently in use
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStore.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStore.java
index 6bdb211d1d..86180a076a 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStore.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStore.java
@@ -21,13 +21,14 @@ 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.checkNotNull;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkState;
-import static org.apache.jackrabbit.guava.common.collect.Maps.newHashMap;
+
import static org.apache.jackrabbit.oak.api.Type.STRING;
import java.io.Closeable;
import java.io.IOException;
import java.io.InputStream;
import java.util.Collections;
+import java.util.HashMap;
import java.util.Map;
import java.util.function.Consumer;
@@ -278,7 +279,7 @@ public class SegmentNodeStore implements NodeStore, Observable {
@NotNull
@Override
public Map<String, String> checkpointInfo(@NotNull String checkpoint) {
- Map<String, String> properties = newHashMap();
+ Map<String, String> properties = new HashMap<>();
checkNotNull(checkpoint);
NodeState cp = scheduler.getHeadNodeState()
.getChildNode("checkpoints")
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 b464635422..db1eb550ff 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
@@ -23,7 +23,7 @@ import static org.apache.jackrabbit.guava.common.base.Preconditions.checkElement
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
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.guava.common.collect.Maps.newHashMap;
+
import static java.util.Collections.emptyList;
import static java.util.Collections.emptyMap;
import static java.util.Collections.singletonList;
@@ -41,6 +41,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.HashMap;
import java.util.List;
import java.util.Map;
@@ -100,7 +101,7 @@ public class SegmentPropertyState extends Record implements PropertyState {
return emptyMap();
}
- Map<String, RecordId> map = newHashMap();
+ Map<String, RecordId> map = new HashMap<>();
Segment segment = getSegment();
ListRecord values = getValueList(segment);
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/TarFiles.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/TarFiles.java
index bf0d8432ab..ac614da0f2 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/TarFiles.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/TarFiles.java
@@ -20,7 +20,7 @@ import static org.apache.jackrabbit.guava.common.base.Preconditions.checkArgumen
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkState;
import static org.apache.jackrabbit.guava.common.collect.Lists.newArrayList;
-import static org.apache.jackrabbit.guava.common.collect.Maps.newHashMap;
+
import static org.apache.jackrabbit.guava.common.collect.Sets.newHashSet;
import static java.util.Collections.emptySet;
@@ -308,14 +308,14 @@ public class TarFiles implements Closeable {
}
private static Map<Integer, Map<Character, String>> collectFiles(SegmentArchiveManager archiveManager) throws IOException {
- Map<Integer, Map<Character, String>> dataFiles = newHashMap();
+ Map<Integer, Map<Character, String>> dataFiles = new HashMap<>();
for (String file : archiveManager.listArchives()) {
Matcher matcher = FILE_NAME_PATTERN.matcher(file);
if (matcher.matches()) {
Integer index = Integer.parseInt(matcher.group(2));
Map<Character, String> files = dataFiles.get(index);
if (files == null) {
- files = newHashMap();
+ files = new HashMap<>();
dataFiles.put(index, files);
}
Character generation = 'a';
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/TarWriter.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/TarWriter.java
index 130a3dcce5..b6c6727007 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/TarWriter.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/TarWriter.java
@@ -16,13 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.jackrabbit.oak.segment.file.tar;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkPositionIndexes;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkState;
-import static org.apache.jackrabbit.guava.common.collect.Maps.newHashMap;
+
import static org.apache.jackrabbit.guava.common.collect.Sets.newHashSet;
import static java.lang.String.format;
import static org.apache.jackrabbit.oak.segment.file.tar.TarConstants.FILE_NAME_FORMAT;
@@ -31,6 +30,7 @@ import static org.apache.jackrabbit.oak.segment.file.tar.binaries.BinaryReferenc
import java.io.Closeable;
import java.io.IOException;
+import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
@@ -72,7 +72,7 @@ class TarWriter implements Closeable {
/**
* Graph of references between segments.
*/
- private final Map<UUID, Set<UUID>> graph = newHashMap();
+ private final Map<UUID, Set<UUID>> graph = new HashMap<>();
private final SegmentArchiveManager archiveManager;
diff --git a/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/DefaultSegmentWriterTest.java b/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/DefaultSegmentWriterTest.java
index 6af65003d9..2cfc6e301a 100644
--- a/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/DefaultSegmentWriterTest.java
+++ b/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/DefaultSegmentWriterTest.java
@@ -20,7 +20,7 @@
package org.apache.jackrabbit.oak.segment;
import static org.apache.jackrabbit.guava.common.collect.Lists.newArrayList;
-import static org.apache.jackrabbit.guava.common.collect.Maps.newHashMap;
+
import static org.apache.jackrabbit.oak.segment.DefaultSegmentWriterBuilder.defaultSegmentWriterBuilder;
import static org.apache.jackrabbit.oak.segment.ListRecord.LEVEL_SIZE;
import static org.apache.jackrabbit.oak.segment.ListRecord.MAX_ELEMENTS;
@@ -38,6 +38,7 @@ import java.io.InputStream;
import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import java.util.Collections;
+import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -217,7 +218,7 @@ public class DefaultSegmentWriterTest {
MapRecord zero = new MapRecord(store.fileStore().getReader(), writer.writeMap(null, ImmutableMap.<String, RecordId>of()));
MapRecord one = new MapRecord(store.fileStore().getReader(), writer.writeMap(null, ImmutableMap.of("one", blockId)));
MapRecord two = new MapRecord(store.fileStore().getReader(), writer.writeMap(null, ImmutableMap.of("one", blockId, "two", blockId)));
- Map<String, RecordId> map = newHashMap();
+ Map<String, RecordId> map = new HashMap<>();
for (int i = 0; i < 1000; i++) {
map.put("key" + i, blockId);
}
@@ -259,7 +260,7 @@ public class DefaultSegmentWriterTest {
assertFalse(iterator.hasNext());
assertNull(many.getEntry("foo"));
- Map<String, RecordId> changes = newHashMap();
+ Map<String, RecordId> changes = new HashMap<>();
changes.put("key0", null);
changes.put("key1000", blockId);
MapRecord modified = new MapRecord(store.fileStore().getReader(), writer.writeMap(many, changes));
@@ -351,7 +352,7 @@ public class DefaultSegmentWriterTest {
public void testMapRemoveNonExisting() throws IOException {
RecordId blockId = writer.writeBlock(bytes, 0, bytes.length);
- Map<String, RecordId> changes = newHashMap();
+ Map<String, RecordId> changes = new HashMap<>();
changes.put("one", null);
MapRecord zero = new MapRecord(store.fileStore().getReader(), writer.writeMap(null, changes));
assertEquals(0, zero.size());
@@ -360,7 +361,7 @@ public class DefaultSegmentWriterTest {
@Test
public void testWorstCaseMap() throws IOException {
RecordId blockId = writer.writeBlock(bytes, 0, bytes.length);
- Map<String, RecordId> map = newHashMap();
+ Map<String, RecordId> map = new HashMap<>();
char[] key = new char[2];
for (int i = 0; i <= MapRecord.BUCKETS_PER_LEVEL; i++) {
key[0] = (char) ('A' + i);
diff --git a/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/ImmutableRecordNumbersTest.java b/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/ImmutableRecordNumbersTest.java
index 39773eb5c8..31ca041195 100644
--- a/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/ImmutableRecordNumbersTest.java
+++ b/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/ImmutableRecordNumbersTest.java
@@ -14,10 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.jackrabbit.oak.segment;
-import static org.apache.jackrabbit.guava.common.collect.Maps.newHashMap;
import static java.util.Arrays.fill;
import static org.junit.Assert.assertEquals;
@@ -88,7 +86,7 @@ public class ImmutableRecordNumbersTest {
}
private Map<Integer, RecordEntry> recordEntries(Map<Integer, Integer> offsets) {
- Map<Integer, RecordEntry> entries = newHashMap();
+ Map<Integer, RecordEntry> entries = new HashMap<>();
for (Map.Entry<Integer, Integer> entry : offsets.entrySet()) {
entries.put(entry.getKey(), new RecordEntry(RecordType.VALUE, entry.getValue()));
diff --git a/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentBufferMonitorTest.java b/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentBufferMonitorTest.java
index a417340f3b..72677a98fe 100644
--- a/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentBufferMonitorTest.java
+++ b/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/SegmentBufferMonitorTest.java
@@ -15,10 +15,8 @@
* limitations under the License.
*
*/
-
package org.apache.jackrabbit.oak.segment;
-import static org.apache.jackrabbit.guava.common.collect.Maps.newHashMap;
import static org.apache.jackrabbit.oak.segment.SegmentBufferMonitor.DIRECT_BUFFER_CAPACITY;
import static org.apache.jackrabbit.oak.segment.SegmentBufferMonitor.DIRECT_BUFFER_COUNT;
import static org.apache.jackrabbit.oak.segment.SegmentBufferMonitor.HEAP_BUFFER_CAPACITY;
@@ -27,6 +25,7 @@ import static org.apache.jackrabbit.oak.stats.SimpleStats.Type.COUNTER;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
+import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.atomic.AtomicLong;
@@ -43,7 +42,7 @@ import org.junit.Test;
public class SegmentBufferMonitorTest {
- private final Map<String, CounterStats> stats = newHashMap();
+ private final Map<String, CounterStats> stats = new HashMap<>();
private final SegmentBufferMonitor segmentBufferMonitor = new SegmentBufferMonitor(new StatisticsProvider() {
@Override
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 9e2a8d7ede..c280dd71d3 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
@@ -16,13 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.jackrabbit.oak.segment;
import static org.apache.jackrabbit.guava.common.base.Strings.repeat;
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.Maps.newHashMap;
+
import static org.apache.jackrabbit.oak.api.Type.BINARY;
import static org.apache.jackrabbit.oak.api.Type.LONGS;
import static org.apache.jackrabbit.oak.api.Type.NAME;
@@ -45,6 +44,7 @@ import static org.mockito.Mockito.when;
import java.io.IOException;
import java.util.Collection;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Random;
@@ -256,7 +256,7 @@ public class SegmentParserTest {
@Test
public void emptyMap() throws IOException {
- Map<String, RecordId> empty = newHashMap();
+ Map<String, RecordId> empty = new HashMap<>();
MapRecord map = new MapRecord(store.getReader(), writer.writeMap(null, empty));
MapInfo mapInfo = new TestParser(store.getReader(), "emptyMap") {
@Override protected void onMapLeaf(RecordId parentId, RecordId mapId, MapRecord map) { }
@@ -296,7 +296,7 @@ public class SegmentParserTest {
}
private Map<String, RecordId> createMap(int size, Random rnd) throws IOException {
- Map<String, RecordId> map = newHashMap();
+ Map<String, RecordId> map = new HashMap<>();
for (int k = 0; k < size; k++) {
map.put("k" + k, writer.writeString("string" + rnd.nextLong()));
}
diff --git a/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/TestUtils.java b/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/TestUtils.java
index ed3a305e60..e1c70e9c5f 100644
--- a/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/TestUtils.java
+++ b/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/TestUtils.java
@@ -16,17 +16,15 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.jackrabbit.oak.segment;
-import static org.apache.jackrabbit.guava.common.collect.Maps.newHashMap;
import static org.apache.jackrabbit.oak.segment.Segment.MAX_SEGMENT_SIZE;
import static org.apache.jackrabbit.oak.segment.Segment.RECORD_ALIGN_BITS;
+import java.util.HashMap;
import java.util.Map;
import java.util.Random;
-
import org.jetbrains.annotations.NotNull;
public final class TestUtils {
@@ -63,7 +61,7 @@ public final class TestUtils {
*/
public static Map<RecordId, RecordId> randomRecordIdMap(Random rnd, SegmentIdProvider idProvider,
int segmentCount, int entriesPerSegment) {
- Map<RecordId, RecordId> map = newHashMap();
+ Map<RecordId, RecordId> map = new HashMap<>();
for (int i = 0; i < segmentCount; i++) {
SegmentId id =idProvider.newDataSegmentId();
int offset = MAX_SEGMENT_SIZE;
diff --git a/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/tar/TarFileTest.java b/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/tar/TarFileTest.java
index e521b0602a..e73979ffb4 100644
--- a/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/tar/TarFileTest.java
+++ b/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/tar/TarFileTest.java
@@ -19,7 +19,7 @@
package org.apache.jackrabbit.oak.segment.file.tar;
import static org.apache.jackrabbit.guava.common.collect.Lists.newArrayList;
-import static org.apache.jackrabbit.guava.common.collect.Maps.newHashMap;
+
import static org.apache.jackrabbit.oak.segment.file.tar.GCGeneration.newGCGeneration;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@@ -137,25 +137,25 @@ public class TarFileTest {
writer.addBinaryReference(generation(3), new UUID(3, 1), "r8");
}
- Map<UUID, Set<String>> one = newHashMap();
+ Map<UUID, Set<String>> one = new HashMap<>();
one.put(new UUID(1, 0), newSet("r0"));
one.put(new UUID(1, 1), newSet("r1"));
one.put(new UUID(1, 2), newSet("r2"));
one.put(new UUID(1, 3), newSet("r3"));
- Map<UUID, Set<String>> two = newHashMap();
+ Map<UUID, Set<String>> two = new HashMap<>();
two.put(new UUID(2, 0), newSet("r4"));
two.put(new UUID(2, 1), newSet("r5"));
two.put(new UUID(2, 2), newSet("r6"));
- Map<UUID, Set<String>> three = newHashMap();
+ Map<UUID, Set<String>> three = new HashMap<>();
three.put(new UUID(3, 0), newSet("r7"));
three.put(new UUID(3, 1), newSet("r8"));
- Map<GCGeneration, Map<UUID, Set<String>>> expected = newHashMap();
+ Map<GCGeneration, Map<UUID, Set<String>>> expected = new HashMap<>();
expected.put(generation(1), one);
expected.put(generation(2), two);
@@ -196,13 +196,13 @@ public class TarFileTest {
try (TarReader swept = reader.sweep(sweep, new HashSet<>())) {
assertNotNull(swept);
- Map<UUID, Set<String>> one = newHashMap();
+ Map<UUID, Set<String>> one = new HashMap<>();
one.put(new UUID(1, 2), newSet("b"));
- Map<UUID, Set<String>> two = newHashMap();
+ Map<UUID, Set<String>> two = new HashMap<>();
two.put(new UUID(2, 1), newSet("c"));
- Map<GCGeneration, Map<UUID, Set<String>>> references = newHashMap();
+ Map<GCGeneration, Map<UUID, Set<String>>> references = new HashMap<>();
references.put(generation(1), one);
references.put(generation(2), two);
@@ -260,7 +260,7 @@ public class TarFileTest {
try (TarReader swept = reader.sweep(sweep, new HashSet<UUID>())) {
assertNotNull(swept);
- Map<UUID, List<UUID>> graph = newHashMap();
+ Map<UUID, List<UUID>> graph = new HashMap<>();
graph.put(new UUID(2, 1), newArrayList(new UUID(2, 2)));
assertEquals(graph, swept.getGraph());
diff --git a/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/tar/TarFilesTest.java b/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/tar/TarFilesTest.java
index 37693d6ede..2f58b1660b 100644
--- a/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/tar/TarFilesTest.java
+++ b/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/tar/TarFilesTest.java
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.jackrabbit.oak.segment.file.tar;
import static org.apache.jackrabbit.guava.common.collect.Sets.newHashSet;
diff --git a/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CommitHookEnhancer.java b/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CommitHookEnhancer.java
index 7c15889172..3c5624ec05 100644
--- a/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CommitHookEnhancer.java
+++ b/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CommitHookEnhancer.java
@@ -22,8 +22,8 @@ import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.jetbrains.annotations.NotNull;
+import java.util.HashMap;
import java.util.Map;
-import static org.apache.jackrabbit.guava.common.collect.Maps.newHashMap;
class CommitHookEnhancer implements CommitHook {
@@ -39,8 +39,8 @@ class CommitHookEnhancer implements CommitHook {
@NotNull
@Override
public NodeState processCommit(NodeState before, NodeState after, CommitInfo info) throws CommitFailedException {
- Map<MountedNodeStore, NodeState> beforeStates = newHashMap();
- Map<MountedNodeStore, NodeState> afterStates = newHashMap();
+ Map<MountedNodeStore, NodeState> beforeStates = new HashMap<>();
+ Map<MountedNodeStore, NodeState> afterStates = new HashMap<>();
for (MountedNodeStore mns : ctx.getNonDefaultStores()) {
NodeState root = mns.getNodeStore().getRoot();
afterStates.put(mns, root);
diff --git a/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CompositeNodeStore.java b/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CompositeNodeStore.java
index 6c72968d3b..cbca4f4dd4 100644
--- a/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CompositeNodeStore.java
+++ b/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CompositeNodeStore.java
@@ -47,6 +47,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.util.Collection;
import java.util.Collections;
+import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -59,7 +60,7 @@ import static org.apache.jackrabbit.guava.common.collect.ImmutableMap.copyOf;
import static org.apache.jackrabbit.guava.common.collect.Iterables.any;
import static org.apache.jackrabbit.guava.common.collect.Iterables.filter;
import static org.apache.jackrabbit.guava.common.collect.Maps.filterKeys;
-import static org.apache.jackrabbit.guava.common.collect.Maps.newHashMap;
+
import static java.lang.System.currentTimeMillis;
import static org.apache.jackrabbit.oak.composite.ModifiedPathDiff.getModifiedPaths;
@@ -221,7 +222,7 @@ public class CompositeNodeStore implements NodeStore, PrefetchNodeStore, Observa
@Override
public String checkpoint(long lifetime, Map<String, String> properties) {
- Map<String, String> globalProperties = newHashMap(properties);
+ Map<String, String> globalProperties = new HashMap<>(properties);
globalProperties.put(CHECKPOINT_METADATA + "created", Long.toString(currentTimeMillis()));
globalProperties.put(CHECKPOINT_METADATA + "expires", Long.toString(currentTimeMillis() + lifetime));
String newCheckpoint = ctx.getGlobalStore().getNodeStore().checkpoint(lifetime, globalProperties);
@@ -257,7 +258,7 @@ public class CompositeNodeStore implements NodeStore, PrefetchNodeStore, Observa
return null;
}
Map<String, String> props = ctx.getGlobalStore().getNodeStore().checkpointInfo(checkpoint);
- Map<MountedNodeStore, NodeState> nodeStates = newHashMap();
+ Map<MountedNodeStore, NodeState> nodeStates = new HashMap<>();
nodeStates.put(ctx.getGlobalStore(), ctx.getGlobalStore().getNodeStore().retrieve(checkpoint));
for (MountedNodeStore nodeStore : ctx.getNonDefaultStores()) {
NodeState nodeState;
diff --git a/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CompositeNodeStoreStats.java b/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CompositeNodeStoreStats.java
index c28ce00291..a439b9346a 100644
--- a/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CompositeNodeStoreStats.java
+++ b/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CompositeNodeStoreStats.java
@@ -35,11 +35,11 @@ import javax.management.openmbean.TabularDataSupport;
import javax.management.openmbean.TabularType;
import java.util.Comparator;
+import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
import java.util.Map.Entry;
-import static org.apache.jackrabbit.guava.common.collect.Maps.newHashMap;
import static org.apache.jackrabbit.stats.TimeSeriesStatsUtil.asCompositeData;
public class CompositeNodeStoreStats implements CompositeNodeStoreStatsMBean, CompositeNodeStoreMonitor {
@@ -87,7 +87,7 @@ public class CompositeNodeStoreStats implements CompositeNodeStoreStatsMBean, Co
this.nodeSwitchToDefaultMount = statisticsProvider.getCounterStats(prefix + NODE_SWITCH_TO_DEFAULT_MOUNT, StatsOptions.DEFAULT);
this.nodeSwitchToNonDefaultMount = statisticsProvider.getCounterStats(prefix + NODE_SWITCH_TO_NON_DEFAULT_MOUNT, StatsOptions.DEFAULT);
- this.nodePathCounts = newHashMap();
+ this.nodePathCounts = new HashMap<>();
this.maxNodePathCount = 0;
this.countPaths = countPaths;
@@ -194,7 +194,7 @@ public class CompositeNodeStoreStats implements CompositeNodeStoreStatsMBean, Co
.stream()
.sorted(Comparator.<Entry<String, Long>>comparingLong(Entry::getValue).reversed())
.map(e -> {
- Map<String, Object> m = newHashMap();
+ Map<String, Object> m = new HashMap<>();
m.put("count", e.getValue());
m.put("path", e.getKey());
return m;
diff --git a/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CompositionContext.java b/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CompositionContext.java
index a0ffe05f47..b48ac38135 100644
--- a/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CompositionContext.java
+++ b/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CompositionContext.java
@@ -29,6 +29,7 @@ import org.apache.jackrabbit.oak.spi.state.PrefetchNodeStore;
import java.io.IOException;
import java.io.InputStream;
import java.util.Collection;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -37,7 +38,7 @@ import java.util.stream.Collectors;
import java.util.stream.StreamSupport;
import static org.apache.jackrabbit.guava.common.collect.Lists.newArrayList;
-import static org.apache.jackrabbit.guava.common.collect.Maps.newHashMap;
+
import static java.util.Collections.singletonList;
class CompositionContext {
@@ -164,7 +165,7 @@ class CompositionContext {
}
CompositeNodeState createRootNodeState(NodeState globalRootState) {
- Map<MountedNodeStore, NodeState> nodeStates = newHashMap();
+ Map<MountedNodeStore, NodeState> nodeStates = new HashMap<>();
nodeStates.put(getGlobalStore(), globalRootState);
for (MountedNodeStore nodeStore : getNonDefaultStores()) {
nodeStates.put(nodeStore, nodeStore.getNodeStore().getRoot());
diff --git a/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CrossMountReferenceValidator.java b/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CrossMountReferenceValidator.java
index 84bd4b3505..f9330ab7d6 100644
--- a/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CrossMountReferenceValidator.java
+++ b/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CrossMountReferenceValidator.java
@@ -17,6 +17,7 @@
package org.apache.jackrabbit.oak.composite;
import java.util.Collection;
+import java.util.HashMap;
import java.util.Map;
import java.util.Set;
@@ -37,7 +38,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import static org.apache.jackrabbit.guava.common.collect.ImmutableSet.of;
-import static org.apache.jackrabbit.guava.common.collect.Maps.newHashMap;
+
import static org.apache.jackrabbit.JcrConstants.JCR_UUID;
import static org.apache.jackrabbit.oak.api.CommitFailedException.INTEGRITY;
import static org.apache.jackrabbit.oak.commons.PathUtils.concat;
@@ -88,7 +89,7 @@ public class CrossMountReferenceValidator extends DefaultValidator {
this.parent = null;
this.path = "/";
this.mip = mip;
- this.newReferencableNodes = newHashMap();
+ this.newReferencableNodes = new HashMap<>();
this.newReferences = ArrayListMultimap.create();
this.uuidDefinition = root.getChildNode(INDEX_DEFINITIONS_NAME).getChildNode("uuid");
this.uuidStores = Multiplexers.getStrategies(true, mip, uuidDefinition, INDEX_CONTENT_NODE_NAME);
diff --git a/oak-store-composite/src/test/java/org/apache/jackrabbit/oak/composite/CompositeChildrenCountTest.java b/oak-store-composite/src/test/java/org/apache/jackrabbit/oak/composite/CompositeChildrenCountTest.java
index f25fdb9938..416a773221 100644
--- a/oak-store-composite/src/test/java/org/apache/jackrabbit/oak/composite/CompositeChildrenCountTest.java
+++ b/oak-store-composite/src/test/java/org/apache/jackrabbit/oak/composite/CompositeChildrenCountTest.java
@@ -36,13 +36,14 @@ import org.apache.jackrabbit.oak.spi.state.NodeStore;
import org.jetbrains.annotations.NotNull;
import org.junit.Test;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import static org.apache.jackrabbit.guava.common.collect.Iterables.cycle;
import static org.apache.jackrabbit.guava.common.collect.Iterables.limit;
import static org.apache.jackrabbit.guava.common.collect.Iterables.transform;
-import static org.apache.jackrabbit.guava.common.collect.Maps.newHashMap;
+
import static java.lang.Long.MAX_VALUE;
import static java.util.Arrays.asList;
import static java.util.Collections.emptyList;
@@ -145,7 +146,7 @@ public class CompositeChildrenCountTest {
private static class CompositeNodeStoreBuilder {
- private final Map<MountedNodeStore, NodeState> rootStates = newHashMap();
+ private final Map<MountedNodeStore, NodeState> rootStates = new HashMap<>();
private final CompositionContext ctx;
diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/MissingBcSweeper2.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/MissingBcSweeper2.java
index 56e0640ade..b4fe2ebab4 100644
--- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/MissingBcSweeper2.java
+++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/MissingBcSweeper2.java
@@ -21,10 +21,11 @@ import static org.apache.jackrabbit.guava.common.collect.Iterables.filter;
import static org.apache.jackrabbit.guava.common.collect.Iterables.partition;
import static org.apache.jackrabbit.guava.common.collect.Iterables.transform;
import static org.apache.jackrabbit.guava.common.collect.Maps.immutableEntry;
-import static org.apache.jackrabbit.guava.common.collect.Maps.newHashMap;
+
import static org.apache.jackrabbit.oak.plugins.document.util.Utils.COMMITROOT_OR_REVISIONS;
import java.util.Collections;
+import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
@@ -121,7 +122,7 @@ final class MissingBcSweeper2 {
Iterable<Map.Entry<Path, UpdateOp>> ops = sweepOperations(documents);
for (List<Map.Entry<Path, UpdateOp>> batch : partition(ops, INVALIDATE_BATCH_SIZE)) {
- Map<Path, UpdateOp> updates = newHashMap();
+ Map<Path, UpdateOp> updates = new HashMap<>();
for (Map.Entry<Path, UpdateOp> entry : batch) {
updates.put(entry.getKey(), entry.getValue());
}
diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocumentSweeper.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocumentSweeper.java
index 1c189468b4..404c1a2819 100644
--- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocumentSweeper.java
+++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocumentSweeper.java
@@ -16,6 +16,7 @@
*/
package org.apache.jackrabbit.oak.plugins.document;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeUnit;
@@ -33,7 +34,7 @@ import static org.apache.jackrabbit.guava.common.collect.Iterables.filter;
import static org.apache.jackrabbit.guava.common.collect.Iterables.partition;
import static org.apache.jackrabbit.guava.common.collect.Iterables.transform;
import static org.apache.jackrabbit.guava.common.collect.Maps.immutableEntry;
-import static org.apache.jackrabbit.guava.common.collect.Maps.newHashMap;
+
import static org.apache.jackrabbit.oak.plugins.document.NodeDocument.isDeletedEntry;
import static org.apache.jackrabbit.oak.plugins.document.NodeDocument.removeCommitRoot;
import static org.apache.jackrabbit.oak.plugins.document.NodeDocument.removeRevision;
@@ -151,7 +152,7 @@ final class NodeDocumentSweeper {
Iterable<Map.Entry<Path, UpdateOp>> ops = sweepOperations(documents);
for (List<Map.Entry<Path, UpdateOp>> batch : partition(ops, INVALIDATE_BATCH_SIZE)) {
- Map<Path, UpdateOp> updates = newHashMap();
+ Map<Path, UpdateOp> updates = new HashMap<>();
for (Map.Entry<Path, UpdateOp> entry : batch) {
updates.put(entry.getKey(), entry.getValue());
}
diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/TestNodeObserver.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/TestNodeObserver.java
index 6b9d66ee4b..108035ad79 100644
--- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/TestNodeObserver.java
+++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/TestNodeObserver.java
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.jackrabbit.oak.plugins.document;
+import java.util.HashMap;
import java.util.Map;
import java.util.Set;
@@ -26,14 +26,13 @@ import org.apache.jackrabbit.oak.plugins.observation.NodeObserver;
import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
import org.jetbrains.annotations.NotNull;
-import static org.apache.jackrabbit.guava.common.collect.Maps.newHashMap;
import static org.apache.jackrabbit.guava.common.collect.Sets.newHashSet;
public class TestNodeObserver extends NodeObserver {
- public final Map<String, Set<String>> added = newHashMap();
- public final Map<String, Set<String>> deleted = newHashMap();
- public final Map<String, Set<String>> changed = newHashMap();
- public final Map<String, Map<String, String>> properties = newHashMap();
+ public final Map<String, Set<String>> added = new HashMap<>();
+ public final Map<String, Set<String>> deleted = new HashMap<>();
+ public final Map<String, Set<String>> changed = new HashMap<>();
+ public final Map<String, Map<String, String>> properties = new HashMap<>();
public TestNodeObserver(String path, String... propertyNames) {
super(path, propertyNames);
@@ -49,7 +48,7 @@ public class TestNodeObserver extends NodeObserver {
@NotNull CommitInfo commitInfo) {
this.added.put(path, newHashSet(added));
if (!properties.isEmpty()) {
- this.properties.put(path, newHashMap(properties));
+ this.properties.put(path, new HashMap<>(properties));
}
}
@@ -63,7 +62,7 @@ public class TestNodeObserver extends NodeObserver {
@NotNull CommitInfo commitInfo) {
this.deleted.put(path, newHashSet(deleted));
if (!properties.isEmpty()) {
- this.properties.put(path, newHashMap(properties));
+ this.properties.put(path, new HashMap<>(properties));
}
}
@@ -77,7 +76,7 @@ public class TestNodeObserver extends NodeObserver {
@NotNull CommitInfo commitInfo) {
this.changed.put(path, newHashSet(changed));
if (!properties.isEmpty()) {
- this.properties.put(path, newHashMap(properties));
+ this.properties.put(path, new HashMap<>(properties));
}
}
diff --git a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeState.java b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeState.java
index 58219be8cf..2cf3eee874 100644
--- a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeState.java
+++ b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeState.java
@@ -16,7 +16,6 @@
*/
package org.apache.jackrabbit.oak.plugins.memory;
-import static org.apache.jackrabbit.guava.common.collect.Maps.newHashMap;
import static org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState.EMPTY_NODE;
import static org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState.MISSING_NODE;
@@ -178,12 +177,12 @@ class MemoryNodeState extends AbstractNodeState {
return (MemoryNodeState) state;
}
- Map<String, PropertyState> properties = newHashMap();
+ Map<String, PropertyState> properties = new HashMap<>();
for (PropertyState property : state.getProperties()) {
properties.put(property.getName(), property);
}
- Map<String, NodeState> nodes = newHashMap();
+ Map<String, NodeState> nodes = new HashMap<>();
for (ChildNodeEntry child : state.getChildNodeEntries()) {
nodes.put(child.getName(), child.getNodeState());
}
diff --git a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeStore.java b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeStore.java
index 31a4210b9f..df9f608115 100644
--- a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeStore.java
+++ b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeStore.java
@@ -19,7 +19,7 @@ package org.apache.jackrabbit.oak.plugins.memory;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkArgument;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkState;
-import static org.apache.jackrabbit.guava.common.collect.Maps.newHashMap;
+
import static org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState.EMPTY_NODE;
import static org.apache.jackrabbit.oak.plugins.memory.ModifiedNodeState.squeeze;
@@ -27,6 +27,7 @@ import java.io.Closeable;
import java.io.IOException;
import java.io.InputStream;
import java.util.Collections;
+import java.util.HashMap;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.atomic.AtomicInteger;
@@ -59,9 +60,9 @@ public class MemoryNodeStore implements NodeStore, Observable {
private final AtomicReference<NodeState> root;
- private final Map<String, Checkpoint> checkpoints = newHashMap();
+ private final Map<String, Checkpoint> checkpoints = new HashMap<>();
- private final Map<Closeable, Observer> observers = newHashMap();
+ private final Map<Closeable, Observer> observers = new HashMap<>();
private final AtomicInteger checkpointCounter = new AtomicInteger();
diff --git a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/ModifiedNodeState.java b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/ModifiedNodeState.java
index af361431ca..fe80ace29e 100644
--- a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/ModifiedNodeState.java
+++ b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/ModifiedNodeState.java
@@ -23,11 +23,12 @@ import static org.apache.jackrabbit.guava.common.base.Predicates.not;
import static org.apache.jackrabbit.guava.common.collect.Iterables.concat;
import static org.apache.jackrabbit.guava.common.collect.Iterables.filter;
import static org.apache.jackrabbit.guava.common.collect.Maps.filterValues;
-import static org.apache.jackrabbit.guava.common.collect.Maps.newHashMap;
+
import static java.util.Collections.emptyList;
import static java.util.Collections.emptyMap;
import static org.apache.jackrabbit.oak.plugins.memory.MemoryChildNodeEntry.iterable;
+import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;
import java.util.function.Function;
@@ -104,12 +105,12 @@ public class ModifiedNodeState extends AbstractNodeState {
*/
public static NodeState squeeze(NodeState state) {
if (state instanceof ModifiedNodeState) {
- Map<String, PropertyState> properties = newHashMap();
+ Map<String, PropertyState> properties = new HashMap<>();
for (PropertyState property : state.getProperties()) {
properties.put(property.getName(), property);
}
- Map<String, NodeState> nodes = newHashMap();
+ Map<String, NodeState> nodes = new HashMap<>();
for (ChildNodeEntry child : state.getChildNodeEntries()) {
nodes.put(child.getName(), squeeze(child.getNodeState()));
}
@@ -166,7 +167,7 @@ public class ModifiedNodeState extends AbstractNodeState {
return base.getProperties(); // shortcut
} else {
if (copy) {
- properties = newHashMap(properties);
+ properties = new HashMap<>(properties);
}
Predicate<PropertyState> predicate = Predicates.compose(
not(in(properties.keySet())), GET_NAME::apply);
@@ -217,7 +218,7 @@ public class ModifiedNodeState extends AbstractNodeState {
return base.getChildNodeNames(); // shortcut
} else {
if (copy) {
- nodes = newHashMap(nodes);
+ nodes = new HashMap<>(nodes);
}
return concat(
filter(base.getChildNodeNames(), not(in(nodes.keySet()))),
@@ -259,13 +260,13 @@ public class ModifiedNodeState extends AbstractNodeState {
if (checkNotNull(properties).isEmpty()) {
this.properties = emptyMap();
} else {
- this.properties = newHashMap(properties);
+ this.properties = new HashMap<>(properties);
}
if (checkNotNull(nodes).isEmpty()) {
this.nodes = emptyMap();
} else {
- this.nodes = newHashMap();
+ this.nodes = new HashMap<>();
for (Entry<String, MutableNodeState> entry : nodes.entrySet()) {
this.nodes.put(entry.getKey(), entry.getValue().snapshot());
}
diff --git a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MutableNodeState.java b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MutableNodeState.java
index 2ef1c60ba5..fde9d21e50 100644
--- a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MutableNodeState.java
+++ b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/MutableNodeState.java
@@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.jackrabbit.oak.plugins.memory;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
-import static org.apache.jackrabbit.guava.common.collect.Maps.newHashMap;
+
import static org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState.MISSING_NODE;
+import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;
@@ -54,13 +54,13 @@ class MutableNodeState extends AbstractNodeState {
* Set of added, modified or removed ({@code null} value)
* property states.
*/
- private final Map<String, PropertyState> properties = newHashMap();
+ private final Map<String, PropertyState> properties = new HashMap<>();
/**
* Set of added, modified or removed (non-existent value)
* child nodes.
*/
- private final Map<String, MutableNodeState> nodes = newHashMap();
+ private final Map<String, MutableNodeState> nodes = new HashMap<>();
/**
* Flag to indicate that this child has been replace in its parent.
diff --git a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/ObserverTracker.java b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/ObserverTracker.java
index 5dcf1eb96b..b59463ac4e 100644
--- a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/ObserverTracker.java
+++ b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/spi/commit/ObserverTracker.java
@@ -16,19 +16,17 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.jackrabbit.oak.spi.commit;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkState;
-import static org.apache.jackrabbit.guava.common.collect.Maps.newHashMap;
+
import static org.apache.jackrabbit.oak.commons.IOUtils.closeQuietly;
import java.io.Closeable;
+import java.util.HashMap;
import java.util.Map;
-import org.apache.jackrabbit.oak.spi.commit.Observable;
-import org.apache.jackrabbit.oak.spi.commit.Observer;
import org.jetbrains.annotations.NotNull;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
@@ -36,7 +34,7 @@ import org.osgi.util.tracker.ServiceTracker;
import org.osgi.util.tracker.ServiceTrackerCustomizer;
public class ObserverTracker implements ServiceTrackerCustomizer {
- private final Map<ServiceReference, Closeable> subscriptions = newHashMap();
+ private final Map<ServiceReference, Closeable> subscriptions = new HashMap<>();
private final Observable observable;
private BundleContext bundleContext;
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 3e517b4bc6..82bf989cfa 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
@@ -21,7 +21,7 @@ import static org.apache.jackrabbit.guava.common.base.Preconditions.checkNotNull
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.newHashMap;
+
import static org.apache.jackrabbit.guava.common.collect.Maps.newLinkedHashMap;
import static org.apache.jackrabbit.guava.common.collect.Sets.newHashSet;
import static org.apache.jackrabbit.guava.common.collect.Sets.newLinkedHashSet;
@@ -49,6 +49,7 @@ import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.math.BigDecimal;
+import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
@@ -380,7 +381,7 @@ class JackrabbitNodeState extends AbstractNodeState {
}
private Map<String, PropertyState> createProperties(NodePropBundle bundle) {
- Map<String, PropertyState> properties = newHashMap();
+ Map<String, PropertyState> properties = new HashMap<>();
String primary;
if (bundle.getNodeTypeName() != null) {
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 a55904eebc..cfaa8a3ec4 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
@@ -22,7 +22,7 @@ import static org.apache.jackrabbit.guava.common.collect.ImmutableSet.copyOf;
import static org.apache.jackrabbit.guava.common.collect.ImmutableSet.of;
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.Maps.newHashMap;
+
import static org.apache.jackrabbit.guava.common.collect.Sets.newHashSet;
import static org.apache.jackrabbit.guava.common.collect.Sets.union;
import static org.apache.jackrabbit.JcrConstants.JCR_SYSTEM;
@@ -40,6 +40,7 @@ import java.io.InputStream;
import java.nio.charset.StandardCharsets;
import java.util.Calendar;
import java.util.Collection;
+import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -59,7 +60,6 @@ import javax.jcr.nodetype.NodeTypeTemplate;
import javax.jcr.nodetype.PropertyDefinitionTemplate;
import javax.jcr.security.Privilege;
-
import org.apache.jackrabbit.guava.common.base.Stopwatch;
import org.apache.jackrabbit.guava.common.collect.HashBiMap;
import org.apache.jackrabbit.guava.common.collect.ImmutableList;
@@ -667,7 +667,7 @@ public class RepositoryUpgrade {
protected ConfigurationParameters mapConfigurationParameters(
BeanConfig config, String... mapping) {
- Map<String, String> map = newHashMap();
+ Map<String, String> map = new HashMap<>();
if (config != null) {
Properties properties = config.getParameters();
for (int i = 0; i + 1 < mapping.length; i += 2) {
diff --git a/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/DatastoreArguments.java b/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/DatastoreArguments.java
index 693c06721c..11c094acd1 100644
--- a/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/DatastoreArguments.java
+++ b/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/DatastoreArguments.java
@@ -30,9 +30,9 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.IOException;
+import java.util.HashMap;
import java.util.Map;
-import static org.apache.jackrabbit.guava.common.collect.Maps.newHashMap;
import static org.apache.jackrabbit.oak.upgrade.cli.parser.StoreType.JCR2_DIR_XML;
/**
@@ -179,7 +179,7 @@ public class DatastoreArguments {
}
private String getDescription(DatastoreArguments datastoreArguments) {
- Map<String, String> map = newHashMap();
+ Map<String, String> map = new HashMap<>();
map.put("srcnode", datastoreArguments.storeArguments.getSrcDescriptor());
map.put("dstnode", datastoreArguments.storeArguments.getDstDescriptor());