Minor name and visibility refactoring

Co-Authored-By: Sören Reichardt <soren.reichardt@neotechnology.com>

Author: s1ck

core/src/main/java/org/neo4j/gds/core/loading/construction/GraphFactory.java

@@ -120,7 +120,7 @@ static NodesBuilder nodesBuilder(
         )).orElseGet(() -> new NodesBuilder(
             maxOriginalId,
             threadCount,
-            TokenToNodeLabelMap.lazy(),
+            TokenToNodeLabel.lazy(),
             NodeLabelTokenToPropertyKeys.lazy(),
             new ConcurrentHashMap<>(),
             idMapBuilder,
@@ -161,7 +161,7 @@ private static NodesBuilder fromSchema(
         return new NodesBuilder(
             maxOriginalId,
             concurrency,
-            TokenToNodeLabelMap.fixed(elementIdentifierLabelTokenMapping, labelTokenNodeLabelMapping),
+            TokenToNodeLabel.fixed(elementIdentifierLabelTokenMapping, labelTokenNodeLabelMapping),
             NodeLabelTokenToPropertyKeys.fixed(nodeSchema),
             new ConcurrentHashMap<>(propertyBuildersByPropertyKey),
             idMapBuilder,

core/src/main/java/org/neo4j/gds/core/loading/construction/NodeLabelTokenToPropertyKeys.java

@@ -64,7 +64,7 @@ abstract Map<String, PropertySchema> propertySchemas(
         Map<String, PropertySchema> importPropertySchemas
     );
 
-    static class Fixed extends NodeLabelTokenToPropertyKeys {
+    private static class Fixed extends NodeLabelTokenToPropertyKeys {
 
         private final NodeSchema nodeSchema;
 
@@ -98,7 +98,7 @@ Map<String, PropertySchema> propertySchemas(
         }
     }
 
-    static class Lazy extends NodeLabelTokenToPropertyKeys {
+    private static class Lazy extends NodeLabelTokenToPropertyKeys {
 
         private final ConcurrentHashMap<NodeLabelToken, Set<String>> labelToPropertyKeys;
 

core/src/main/java/org/neo4j/gds/core/loading/construction/NodesBuilder.java

@@ -85,7 +85,7 @@ public final class NodesBuilder {
     NodesBuilder(
         long maxOriginalId,
         int concurrency,
-        TokenToNodeLabelMap tokenToNodeLabelMap,
+        TokenToNodeLabel tokenToNodeLabel,
         NodeLabelTokenToPropertyKeys nodeLabelTokenToPropertyKeys,
         ConcurrentMap<String, NodePropertiesFromStoreBuilder> propertyBuildersByPropertyKey,
         IdMapBuilder idMapBuilder,
@@ -107,7 +107,7 @@ public final class NodesBuilder {
         this.nodeImporter = new NodeImporter(
             idMapBuilder,
             labelInformationBuilder,
-            tokenToNodeLabelMap.labelTokenNodeLabelMapping(),
+            tokenToNodeLabel.labelTokenNodeLabelMapping(),
             hasProperties
         );
 
@@ -126,7 +126,7 @@ public final class NodesBuilder {
                 seenNodeIdPredicate,
                 hasLabelInformation,
                 hasProperties,
-                tokenToNodeLabelMap,
+                tokenToNodeLabel,
                 nodeLabelTokenToPropertyKeys,
                 propertyBuilderFn
             )
@@ -287,7 +287,7 @@ private static class ThreadLocalBuilder implements AutoCloseable {
 
         private final LongAdder importedNodes;
         private final LongPredicate seenNodeIdPredicate;
-        private final TokenToNodeLabelMap tokenToNodeLabelMap;
+        private final TokenToNodeLabel tokenToNodeLabel;
         private final NodeLabelTokenToPropertyKeys nodeLabelTokenToPropertyKeys;
         private final NodesBatchBuffer buffer;
         private final Function<String, NodePropertiesFromStoreBuilder> propertyBuilderFn;
@@ -301,13 +301,13 @@ private static class ThreadLocalBuilder implements AutoCloseable {
             LongPredicate seenNodeIdPredicate,
             boolean hasLabelInformation,
             boolean hasProperties,
-            TokenToNodeLabelMap tokenToNodeLabelMap,
+            TokenToNodeLabel tokenToNodeLabel,
             NodeLabelTokenToPropertyKeys nodeLabelTokenToPropertyKeys,
             Function<String, NodePropertiesFromStoreBuilder> propertyBuilderFn
         ) {
             this.importedNodes = importedNodes;
             this.seenNodeIdPredicate = seenNodeIdPredicate;
-            this.tokenToNodeLabelMap = tokenToNodeLabelMap;
+            this.tokenToNodeLabel = tokenToNodeLabel;
             this.nodeLabelTokenToPropertyKeys = nodeLabelTokenToPropertyKeys;
             this.propertyBuilderFn = propertyBuilderFn;
 
@@ -323,7 +323,7 @@ private static class ThreadLocalBuilder implements AutoCloseable {
 
         public void addNode(long originalId, NodeLabelToken nodeLabels) {
             if (!seenNodeIdPredicate.test(originalId)) {
-                long[] labels = labelTokens(nodeLabels);
+                long[] labels = getOrCreateLabelTokens(nodeLabels);
 
                 buffer.add(originalId, LongPropertyReference.empty(), labels);
                 if (buffer.isFull()) {
@@ -335,7 +335,7 @@ public void addNode(long originalId, NodeLabelToken nodeLabels) {
 
         public void addNode(long originalId, NodeLabelToken nodeLabels, PropertyValues properties) {
             if (!seenNodeIdPredicate.test(originalId)) {
-                long[] labels = labelTokens(nodeLabels);
+                long[] labels = getOrCreateLabelTokens(nodeLabels);
                 this.nodeLabelTokenToPropertyKeys.add(nodeLabels, properties.propertyKeys());
 
                 int propertyReference = batchNodeProperties.size();
@@ -349,14 +349,14 @@ public void addNode(long originalId, NodeLabelToken nodeLabels, PropertyValues p
             }
         }
 
-        private long[] labelTokens(NodeLabelToken nodeLabels) {
+        private long[] getOrCreateLabelTokens(NodeLabelToken nodeLabels) {
             if (nodeLabels.isEmpty()) {
                 return anyLabelArray();
             }
 
             long[] labelIds = new long[nodeLabels.size()];
             for (int i = 0; i < labelIds.length; i++) {
-                labelIds[i] = tokenToNodeLabelMap.getTokenForNodeLabel(nodeLabels.get(i));
+                labelIds[i] = tokenToNodeLabel.getOrCreateToken(nodeLabels.get(i));
             }
 
             return labelIds;
@@ -412,7 +412,7 @@ private int importProperty(long neoNodeId, String propertyKey, Value value) {
         private long[] anyLabelArray() {
             var anyLabelArray = this.anyLabelArray;
             if (anyLabelArray[0] == NOT_INITIALIZED) {
-                anyLabelArray[0] = tokenToNodeLabelMap.getTokenForNodeLabel(NodeLabel.ALL_NODES);
+                anyLabelArray[0] = tokenToNodeLabel.getOrCreateToken(NodeLabel.ALL_NODES);
             }
             return anyLabelArray;
         }

…ng/construction/TokenToNodeLabelMap.java …ading/construction/TokenToNodeLabel.javacore/src/main/java/org/neo4j/gds/core/loading/construction/TokenToNodeLabelMap.java renamed to core/src/main/java/org/neo4j/gds/core/loading/construction/TokenToNodeLabel.java core/src/main/java/org/neo4j/gds/core/loading/construction/TokenToNodeLabelMap.java renamed to core/src/main/java/org/neo4j/gds/core/loading/construction/TokenToNodeLabel.java

@@ -32,23 +32,23 @@
 import static org.neo4j.gds.core.GraphDimensions.NO_SUCH_LABEL;
 import static org.neo4j.gds.utils.StringFormatting.formatWithLocale;
 
-public abstract class TokenToNodeLabelMap {
+abstract class TokenToNodeLabel {
 
     final ObjectIntMap<NodeLabel> elementIdentifierLabelTokenMapping;
     final IntObjectHashMap<List<NodeLabel>> labelTokenNodeLabelMapping;
 
-    public static TokenToNodeLabelMap fixed(
+    static TokenToNodeLabel fixed(
         ObjectIntMap<NodeLabel> elementIdentifierLabelTokenMapping,
         IntObjectHashMap<List<NodeLabel>> labelTokenNodeLabelMapping
     ) {
-        return new FixedTokenToNodeLabelMap(elementIdentifierLabelTokenMapping, labelTokenNodeLabelMapping);
+        return new FixedTokenToNodeLabel(elementIdentifierLabelTokenMapping, labelTokenNodeLabelMapping);
     }
 
-    public static TokenToNodeLabelMap lazy() {
-        return new LazyTokenToNodeLabelMap();
+    static TokenToNodeLabel lazy() {
+        return new LazyTokenToNodeLabel();
     }
 
-    TokenToNodeLabelMap(
+    TokenToNodeLabel(
         ObjectIntMap<NodeLabel> elementIdentifierLabelTokenMapping,
         IntObjectHashMap<List<NodeLabel>> labelTokenNodeLabelMapping
     ) {
@@ -60,39 +60,39 @@ IntObjectHashMap<List<NodeLabel>> labelTokenNodeLabelMapping() {
         return this.labelTokenNodeLabelMapping;
     }
 
-    public abstract int getTokenForNodeLabel(NodeLabel nodeLabel);
+    abstract int getOrCreateToken(NodeLabel nodeLabel);
 
-    static class FixedTokenToNodeLabelMap extends TokenToNodeLabelMap {
+    private static class FixedTokenToNodeLabel extends TokenToNodeLabel {
 
-        FixedTokenToNodeLabelMap(
+        FixedTokenToNodeLabel(
             ObjectIntMap<NodeLabel> elementIdentifierLabelTokenMapping,
             IntObjectHashMap<List<NodeLabel>> labelTokenNodeLabelMapping
         ) {
             super(elementIdentifierLabelTokenMapping, labelTokenNodeLabelMapping);
         }
 
         @Override
-        public int getTokenForNodeLabel(NodeLabel nodeLabel) {
+        public int getOrCreateToken(NodeLabel nodeLabel) {
             if (!elementIdentifierLabelTokenMapping.containsKey(nodeLabel)) {
                 throw new IllegalArgumentException(formatWithLocale("No token was specified for node label %s", nodeLabel));
             }
             return elementIdentifierLabelTokenMapping.get(nodeLabel);
         }
     }
 
-    static class LazyTokenToNodeLabelMap extends TokenToNodeLabelMap {
+    private static class LazyTokenToNodeLabel extends TokenToNodeLabel {
 
         private final Lock lock;
         private int nextLabelId;
 
-        LazyTokenToNodeLabelMap() {
+        LazyTokenToNodeLabel() {
             super(new ObjectIntScatterMap<>(), new IntObjectHashMap<>());
             this.lock = new ReentrantLock(true);
             this.nextLabelId = 0;
         }
 
         @Override
-        public int getTokenForNodeLabel(NodeLabel nodeLabel) {
+        public int getOrCreateToken(NodeLabel nodeLabel) {
             var token = elementIdentifierLabelTokenMapping.getOrDefault(nodeLabel, NO_SUCH_LABEL);
             if (token == NO_SUCH_LABEL) {
                 lock.lock();