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/10/13 13:09:01 UTC
(jackrabbit-oak) branch OAK-11192 created (now 57e135c029)
This is an automated email from the ASF dual-hosted git repository.
daim pushed a change to branch OAK-11192
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
at 57e135c029 OAK-11192 : removed usage of Maps.newLinkedHashMap
This branch includes the following new commits:
new 57e135c029 OAK-11192 : removed usage of Maps.newLinkedHashMap
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-11192 : removed usage of Maps.newLinkedHashMap
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
daim pushed a commit to branch OAK-11192
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit 57e135c0297af9ef0371a3ed3ca788e35205b08a
Author: Rishabh Kumar <di...@adobe.com>
AuthorDate: Sun Oct 13 18:38:46 2024 +0530
OAK-11192 : removed usage of Maps.newLinkedHashMap
---
.../authentication/ldap/impl/LdapIdentityPropertiesTest.java | 6 +++---
.../jackrabbit/oak/scalability/suites/ScalabilityAbstractSuite.java | 6 +++---
.../src/test/java/org/apache/jackrabbit/oak/osgi/OsgiUtilTest.java | 5 ++---
.../jackrabbit/oak/plugins/nodetype/EffectiveNodeTypeImpl.java | 4 ++--
.../org/apache/jackrabbit/oak/plugins/nodetype/NodeTypeImpl.java | 3 ++-
.../src/main/java/org/apache/jackrabbit/oak/query/ast/OrImpl.java | 3 +--
.../org/apache/jackrabbit/oak/security/user/MembershipBaseTest.java | 4 ++--
.../java/org/apache/jackrabbit/oak/query/facet/FacetResult.java | 3 ++-
.../java/org/apache/jackrabbit/oak/segment/file/tar/TarReader.java | 5 ++---
.../java/org/apache/jackrabbit/oak/segment/RecordCacheTest.java | 4 ++--
.../java/org/apache/jackrabbit/oak/segment/file/FileStoreIT.java | 4 ++--
.../jackrabbit/oak/plugins/document/VersionGarbageCollector.java | 2 +-
.../apache/jackrabbit/oak/plugins/document/NodeDocumentTest.java | 6 +++---
.../java/org/apache/jackrabbit/oak/upgrade/JackrabbitNodeState.java | 3 +--
14 files changed, 28 insertions(+), 30 deletions(-)
diff --git a/oak-auth-ldap/src/test/java/org/apache/jackrabbit/oak/security/authentication/ldap/impl/LdapIdentityPropertiesTest.java b/oak-auth-ldap/src/test/java/org/apache/jackrabbit/oak/security/authentication/ldap/impl/LdapIdentityPropertiesTest.java
index ae41943845..f9b7ce61ff 100644
--- a/oak-auth-ldap/src/test/java/org/apache/jackrabbit/oak/security/authentication/ldap/impl/LdapIdentityPropertiesTest.java
+++ b/oak-auth-ldap/src/test/java/org/apache/jackrabbit/oak/security/authentication/ldap/impl/LdapIdentityPropertiesTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.jackrabbit.oak.security.authentication.ldap.impl;
-import org.apache.jackrabbit.guava.common.collect.Maps;
+import java.util.LinkedHashMap;
import java.util.Map;
import org.junit.Before;
import org.junit.Test;
@@ -50,7 +50,7 @@ public class LdapIdentityPropertiesTest {
@Test
public void testConstructorWithMap() {
- Map m = Maps.newLinkedHashMap();
+ Map m = new LinkedHashMap<>();
m.put("b", "v");
m.put("B", "v2");
LdapIdentityProperties props = new LdapIdentityProperties(m);
@@ -84,7 +84,7 @@ public class LdapIdentityPropertiesTest {
@Test
public void testPutAll() {
- Map m = Maps.newLinkedHashMap();
+ Map m = new LinkedHashMap<>();
m.put("b", "v");
m.put("B", "v2");
properties.putAll(m);
diff --git a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/suites/ScalabilityAbstractSuite.java b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/suites/ScalabilityAbstractSuite.java
index 4f9f0d0d37..7ef8fb6b62 100644
--- a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/suites/ScalabilityAbstractSuite.java
+++ b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/scalability/suites/ScalabilityAbstractSuite.java
@@ -20,9 +20,9 @@ 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.Maps.newConcurrentMap;
-import static org.apache.jackrabbit.guava.common.collect.Maps.newLinkedHashMap;
import java.io.PrintStream;
+import java.util.LinkedHashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
@@ -135,7 +135,7 @@ public abstract class ScalabilityAbstractSuite implements ScalabilitySuite, CSVR
private RepositoryFixture fixture;
protected ScalabilityAbstractSuite() {
- this.benchmarks = newLinkedHashMap();
+ this.benchmarks = new LinkedHashMap<>();
}
@Override
@@ -429,7 +429,7 @@ public abstract class ScalabilityAbstractSuite implements ScalabilitySuite, CSVR
private final Map<ScalabilityBenchmark, DescriptiveStatistics> stats;
public Result() {
- this.stats = newLinkedHashMap();
+ this.stats = new LinkedHashMap<>();
}
public void addBenchmarkStatistics(ScalabilityBenchmark benchmark,
diff --git a/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/osgi/OsgiUtilTest.java b/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/osgi/OsgiUtilTest.java
index a9c11ea218..9c82bf11ad 100644
--- a/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/osgi/OsgiUtilTest.java
+++ b/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/osgi/OsgiUtilTest.java
@@ -17,7 +17,6 @@
package org.apache.jackrabbit.oak.osgi;
-import org.apache.jackrabbit.oak.spi.whiteboard.WhiteboardUtils;
import org.junit.Test;
import org.osgi.framework.BundleContext;
import org.osgi.framework.FrameworkUtil;
@@ -25,9 +24,9 @@ import org.osgi.framework.InvalidSyntaxException;
import org.osgi.service.component.ComponentContext;
import java.util.Dictionary;
+import java.util.LinkedHashMap;
import java.util.Map;
-import static org.apache.jackrabbit.guava.common.collect.Maps.newLinkedHashMap;
import static org.apache.jackrabbit.oak.osgi.OsgiUtil.appendEscapedLdapValue;
import static org.apache.jackrabbit.oak.osgi.OsgiUtil.appendLdapFilterAttribute;
import static org.apache.jackrabbit.oak.osgi.OsgiUtil.getFilter;
@@ -228,7 +227,7 @@ public class OsgiUtilTest {
assertEquals("(!(foo=*))", appendLdapFilterAttribute(b, "foo", null).toString());
b.setLength(0);
- Map<String, String> m = newLinkedHashMap();
+ Map<String, String> m = new LinkedHashMap<>();
m.put("foo", "bar");
m.put("empty", null);
m.put("escaped", "*xyz)");
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/EffectiveNodeTypeImpl.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/EffectiveNodeTypeImpl.java
index 56cc48ae53..e91b3c5238 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/EffectiveNodeTypeImpl.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/EffectiveNodeTypeImpl.java
@@ -22,6 +22,7 @@ import static javax.jcr.PropertyType.UNDEFINED;
import static org.apache.jackrabbit.JcrConstants.NT_BASE;
import java.util.ArrayList;
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
@@ -45,7 +46,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.jackrabbit.guava.common.collect.Iterables;
-import org.apache.jackrabbit.guava.common.collect.Maps;
/**
* EffectiveNodeTypeImpl... TODO
@@ -56,7 +56,7 @@ class EffectiveNodeTypeImpl implements EffectiveNodeType {
private static final NodeTypeImpl[] NO_MIXINS = new NodeTypeImpl[0];
- private final Map<String, NodeTypeImpl> nodeTypes = Maps.newLinkedHashMap();
+ private final Map<String, NodeTypeImpl> nodeTypes = new LinkedHashMap<>();
private final ReadOnlyNodeTypeManager ntMgr;
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/NodeTypeImpl.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/NodeTypeImpl.java
index 9fb4222b9b..d097464a43 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/NodeTypeImpl.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/NodeTypeImpl.java
@@ -50,6 +50,7 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.HashSet;
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -209,7 +210,7 @@ class NodeTypeImpl extends AbstractTypeDefinition implements NodeType {
@Override
public NodeType[] getSupertypes() {
- Map<String, NodeType> supertypes = Maps.newLinkedHashMap();
+ Map<String, NodeType> supertypes = new LinkedHashMap<>();
addSupertypes(definition, supertypes);
return supertypes.values().toArray(NO_NODE_TYPES);
}
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/OrImpl.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/OrImpl.java
index 438a7d8dec..502edf9569 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/OrImpl.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/OrImpl.java
@@ -20,7 +20,6 @@ package org.apache.jackrabbit.oak.query.ast;
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.Maps.newLinkedHashMap;
import static org.apache.jackrabbit.oak.query.ast.AstElementFactory.copyElementAndCheckReference;
import static org.apache.jackrabbit.oak.query.ast.Operator.EQUAL;
@@ -81,7 +80,7 @@ public class OrImpl extends ConstraintImpl {
}
LinkedHashMap<DynamicOperandImpl, LinkedHashSet<StaticOperandImpl>> in =
- newLinkedHashMap();
+ new LinkedHashMap<>();
Iterator<ConstraintImpl> iterator = simplified.iterator();
while (iterator.hasNext()) {
ConstraintImpl simple = iterator.next();
diff --git a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/MembershipBaseTest.java b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/MembershipBaseTest.java
index 5a573961f0..c141ab042e 100644
--- a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/MembershipBaseTest.java
+++ b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/MembershipBaseTest.java
@@ -17,7 +17,6 @@
package org.apache.jackrabbit.oak.security.user;
import org.apache.jackrabbit.guava.common.collect.Iterables;
-import org.apache.jackrabbit.guava.common.collect.Maps;
import org.apache.jackrabbit.JcrConstants;
import org.apache.jackrabbit.api.security.user.Authorizable;
import org.apache.jackrabbit.api.security.user.Group;
@@ -36,6 +35,7 @@ import javax.jcr.RepositoryException;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.Iterator;
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -118,7 +118,7 @@ public abstract class MembershipBaseTest extends AbstractUserTest implements Use
@NotNull
Map<String, String> createIdMap(int start, int end) {
- Map<String, String> memberIds = Maps.newLinkedHashMap();
+ Map<String, String> memberIds = new LinkedHashMap<>();
for (int i = start; i < end; i++) {
String memberId = "member" + i;
memberIds.put(getContentID(memberId), memberId);
diff --git a/oak-query-spi/src/main/java/org/apache/jackrabbit/oak/query/facet/FacetResult.java b/oak-query-spi/src/main/java/org/apache/jackrabbit/oak/query/facet/FacetResult.java
index 7b0e3eb896..edc3d2f757 100644
--- a/oak-query-spi/src/main/java/org/apache/jackrabbit/oak/query/facet/FacetResult.java
+++ b/oak-query-spi/src/main/java/org/apache/jackrabbit/oak/query/facet/FacetResult.java
@@ -34,6 +34,7 @@ import javax.jcr.query.Row;
import javax.jcr.query.RowIterator;
import java.util.Collections;
import java.util.HashMap;
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -109,7 +110,7 @@ public class FacetResult {
private void parseJson(String dimension, String jsonFacetString) {
JsopTokenizer jsopTokenizer = new JsopTokenizer(jsonFacetString);
List<Facet> facets = perDimFacets.get(dimension);
- Map<String, Facet> facetsMap = Maps.newLinkedHashMap();
+ Map<String, Facet> facetsMap = new LinkedHashMap<>();
if (facets != null) {
for (Facet facet : facets) {
if (!facetsMap.containsKey(facet.getLabel())) {
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/TarReader.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/TarReader.java
index c7ae9fc91e..cb0022ce15 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/TarReader.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/tar/TarReader.java
@@ -19,7 +19,6 @@
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.newLinkedHashMap;
import static org.apache.jackrabbit.guava.common.collect.Maps.newTreeMap;
import static java.util.Collections.singletonList;
import static org.apache.jackrabbit.oak.segment.file.tar.GCGeneration.newGCGeneration;
@@ -97,7 +96,7 @@ public class TarReader implements Closeable {
// no generation has a valid index, so recover as much as we can
log.warn("Could not find a valid tar index in {}, recovering...", list);
- LinkedHashMap<UUID, byte[]> entries = newLinkedHashMap();
+ LinkedHashMap<UUID, byte[]> entries = new LinkedHashMap<>();
for (String file : sorted.values()) {
collectFileEntries(file, entries, true, archiveManager);
}
@@ -128,7 +127,7 @@ public class TarReader implements Closeable {
log.info("Could not find a valid tar index in {}, recovering read-only", archiveName);
// collecting the entries (without touching the original file) and
// writing them into an artificial tar file '.ro.bak'
- LinkedHashMap<UUID, byte[]> entries = newLinkedHashMap();
+ LinkedHashMap<UUID, byte[]> entries = new LinkedHashMap<>();
collectFileEntries(archiveName, entries, false, segmentArchiveManager);
String bakFile = findAvailGen(archiveName, ".ro.bak", segmentArchiveManager);
generateTarFile(entries, bakFile, recovery, segmentArchiveManager);
diff --git a/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/RecordCacheTest.java b/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/RecordCacheTest.java
index fcc9c31966..f4380b897b 100644
--- a/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/RecordCacheTest.java
+++ b/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/RecordCacheTest.java
@@ -19,7 +19,6 @@
package org.apache.jackrabbit.oak.segment;
-import static org.apache.jackrabbit.guava.common.collect.Maps.newLinkedHashMap;
import static org.apache.jackrabbit.oak.segment.RecordCache.newRecordCache;
import static org.apache.jackrabbit.oak.segment.TestUtils.newRecordId;
import static org.junit.Assert.assertEquals;
@@ -29,6 +28,7 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
@@ -112,7 +112,7 @@ public class RecordCacheTest {
@Test
public void invalidate() {
RecordCache<String> cache = newRecordCache(100);
- Map<String, RecordId> keys = newLinkedHashMap();
+ Map<String, RecordId> keys = new LinkedHashMap<>();
for (int k = 0; k < 100; k ++) {
String key = "key-" + k;
RecordId value = newRecordId(idProvider, rnd);
diff --git a/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/FileStoreIT.java b/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/FileStoreIT.java
index 29525e066d..7bab47abb3 100644
--- a/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/FileStoreIT.java
+++ b/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/FileStoreIT.java
@@ -18,7 +18,6 @@
*/
package org.apache.jackrabbit.oak.segment.file;
-import static org.apache.jackrabbit.guava.common.collect.Maps.newLinkedHashMap;
import static java.util.concurrent.Executors.newSingleThreadExecutor;
import static java.util.concurrent.TimeUnit.SECONDS;
import static org.apache.jackrabbit.oak.segment.DefaultSegmentWriterBuilder.defaultSegmentWriterBuilder;
@@ -33,6 +32,7 @@ import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.io.RandomAccessFile;
+import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Random;
@@ -201,7 +201,7 @@ public class FileStoreIT {
@Test
public void snfeAfterOnRC()
throws IOException, InvalidFileStoreVersionException, InterruptedException {
- Map<String, String> roots = newLinkedHashMap();
+ Map<String, String> roots = new LinkedHashMap<>();
try (FileStore rwStore = fileStoreBuilder(getFileStoreFolder()).build()) {
// Block scheduled journal updates
diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollector.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollector.java
index 6beeb7681a..bdbed7d6a8 100644
--- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollector.java
+++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollector.java
@@ -2392,7 +2392,7 @@ public class VersionGarbageCollector {
int lastLoggedCount = 0;
int recreatedCount = 0;
while (idListItr.hasNext() && !cancel.get()) {
- Map<String, Long> deletionBatch = Maps.newLinkedHashMap();
+ Map<String, Long> deletionBatch = new LinkedHashMap<>();
for (String s : idListItr.next()) {
Map.Entry<String, Long> parsed;
try {
diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeDocumentTest.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeDocumentTest.java
index e53305c05b..fd63d9a650 100644
--- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeDocumentTest.java
+++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeDocumentTest.java
@@ -20,6 +20,7 @@ import java.lang.ref.ReferenceQueue;
import java.util.Collections;
import java.util.HashSet;
import java.util.Iterator;
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Random;
@@ -46,7 +47,6 @@ import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.jackrabbit.oak.spi.state.NodeStore;
import org.junit.Test;
-import static org.apache.jackrabbit.guava.common.collect.Maps.newLinkedHashMap;
import static org.apache.jackrabbit.guava.common.collect.Maps.newTreeMap;
import static java.lang.System.currentTimeMillis;
import static java.util.Collections.singletonList;
@@ -978,7 +978,7 @@ public class NodeDocumentTest {
@Test
public void tooManyReadsOnGetVisibleChangesWithLongRunningBranchCommit() throws Exception {
int numChanges = 843;
- final Map<String, Document> prevDocCalls = newLinkedHashMap();
+ final Map<String, Document> prevDocCalls = new LinkedHashMap<>();
MemoryDocumentStore store = new MemoryDocumentStore() {
@Override
public <T extends Document> T find(Collection<T> collection,
@@ -1045,7 +1045,7 @@ public class NodeDocumentTest {
@Test
public void readsWithOverlappingPreviousDocuments() throws Exception {
- final Map<String, Document> prevDocCalls = newLinkedHashMap();
+ final Map<String, Document> prevDocCalls = new LinkedHashMap<>();
MemoryDocumentStore store = new MemoryDocumentStore() {
@Override
public <T extends Document> T find(Collection<T> collection,
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 2eb74293d7..8c942022bf 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,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.Iterables.addAll;
-import static org.apache.jackrabbit.guava.common.collect.Maps.newLinkedHashMap;
import static org.apache.jackrabbit.JcrConstants.JCR_FROZENMIXINTYPES;
import static org.apache.jackrabbit.JcrConstants.JCR_FROZENPRIMARYTYPE;
import static org.apache.jackrabbit.JcrConstants.JCR_FROZENUUID;
@@ -365,7 +364,7 @@ class JackrabbitNodeState extends AbstractNodeState {
}
private Map<String, NodeId> createNodes(NodePropBundle bundle) {
- Map<String, NodeId> children = newLinkedHashMap();
+ Map<String, NodeId> children = new LinkedHashMap<>();
for (ChildNodeEntry entry : bundle.getChildNodeEntries()) {
String base = createName(entry.getName());
String name = base;