Fix up Kernel changes

neo4j · Sep 24, 2024 · 4b87e6e · 4b87e6e
1 parent 03e6f68
commit 4b87e6e
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 10 deletions.
diff --git a/common/src/main/java/org/neo4j/cypher/export/DatabaseSubGraph.java b/common/src/main/java/org/neo4j/cypher/export/DatabaseSubGraph.java
@@ -35,6 +35,7 @@
 import org.neo4j.internal.kernel.api.Read;
 import org.neo4j.internal.kernel.api.TokenRead;
 import org.neo4j.kernel.api.KernelTransaction;
+import org.neo4j.token.api.TokenConstants;
 
 public class DatabaseSubGraph implements SubGraph {
     private final Transaction transaction;
@@ -147,18 +148,18 @@ public long countsForNode(Label label) {
     @Override
     public long countsForRelationship(RelationshipType type, Label end) {
         return read.countsForRelationship(
-                TokenRead.ANY_LABEL, tokenRead.relationshipType(type.name()), tokenRead.nodeLabel(end.name()));
+                TokenConstants.ANY_LABEL, tokenRead.relationshipType(type.name()), tokenRead.nodeLabel(end.name()));
     }
 
     @Override
     public long countsForRelationship(Label start, RelationshipType type) {
         return read.countsForRelationship(
-                tokenRead.nodeLabel(start.name()), tokenRead.relationshipType(type.name()), TokenRead.ANY_LABEL);
+                tokenRead.nodeLabel(start.name()), tokenRead.relationshipType(type.name()), TokenConstants.ANY_LABEL);
     }
 
     @Override
     public long countsForRelationship(RelationshipType type) {
         return read.countsForRelationship(
-                TokenRead.ANY_LABEL, tokenRead.relationshipType(type.name()), TokenRead.ANY_LABEL);
+                TokenConstants.ANY_LABEL, tokenRead.relationshipType(type.name()), TokenConstants.ANY_LABEL);
     }
 }
diff --git a/core/src/main/java/apoc/meta/Meta.java b/core/src/main/java/apoc/meta/Meta.java
@@ -20,8 +20,8 @@
 
 import static apoc.util.MapUtil.map;
 import static java.lang.String.format;
-import static org.neo4j.internal.kernel.api.TokenRead.ANY_LABEL;
-import static org.neo4j.internal.kernel.api.TokenRead.ANY_RELATIONSHIP_TYPE;
+import static org.neo4j.token.api.TokenConstants.ANY_LABEL;
+import static org.neo4j.token.api.TokenConstants.ANY_RELATIONSHIP_TYPE;
 
 import apoc.export.util.NodesAndRelsSubGraph;
 import apoc.result.GraphResult;

diff --git a/core/src/main/java/apoc/stats/DegreeDistribution.java b/core/src/main/java/apoc/stats/DegreeDistribution.java
@@ -18,9 +18,6 @@
  */
 package apoc.stats;
 
-import static org.neo4j.internal.kernel.api.TokenRead.ANY_LABEL;
-import static org.neo4j.internal.kernel.api.TokenRead.ANY_RELATIONSHIP_TYPE;
-
 import apoc.Pools;
 import apoc.path.RelationshipTypeAndDirections;
 import apoc.util.kernel.MultiThreadedGlobalGraphOperations;
@@ -44,6 +41,9 @@
 import org.neo4j.procedure.Procedure;
 import org.neo4j.token.api.NamedToken;
 
+import static org.neo4j.token.api.TokenConstants.ANY_LABEL;
+import static org.neo4j.token.api.TokenConstants.ANY_RELATIONSHIP_TYPE;
+
 /**
  * @author mh
  * @since 07.08.17

diff --git a/core/src/main/java/apoc/stats/DegreeUtil.java b/core/src/main/java/apoc/stats/DegreeUtil.java
@@ -18,12 +18,12 @@
  */
 package apoc.stats;
 
-import static org.neo4j.internal.kernel.api.TokenRead.ANY_RELATIONSHIP_TYPE;
-
 import org.neo4j.graphdb.Direction;
 import org.neo4j.internal.kernel.api.NodeCursor;
 import org.neo4j.internal.kernel.api.helpers.Nodes;
 
+import static org.neo4j.token.api.TokenConstants.ANY_RELATIONSHIP_TYPE;
+
 public class DegreeUtil {
 
     public static int degree(NodeCursor nodeCursor, int relType, Direction direction) {