Fix post values merge compilation failures

neo4j · Aug 21, 2017 · a05897b · a05897b
1 parent 525b09a
commit a05897b
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 23 deletions.
diff --git a/community/kernel-api/src/main/java/org/neo4j/impl/kernel/api/NodeValueIndexCursor.java b/community/kernel-api/src/main/java/org/neo4j/impl/kernel/api/NodeValueIndexCursor.java
@@ -19,7 +19,7 @@
  */
 package org.neo4j.impl.kernel.api;
 
-import org.neo4j.values.Value;
+import org.neo4j.values.storable.Value;
 
 /**
  * Cursor for scanning the property values of nodes in a schema index.

diff --git a/community/kernel-api/src/main/java/org/neo4j/impl/kernel/api/PropertyCursor.java b/community/kernel-api/src/main/java/org/neo4j/impl/kernel/api/PropertyCursor.java
@@ -21,9 +21,9 @@
 
 import java.util.regex.Pattern;
 
-import org.neo4j.values.Value;
+import org.neo4j.values.storable.Value;
-import org.neo4j.values.ValueGroup;
+import org.neo4j.values.storable.ValueGroup;
-import org.neo4j.values.ValueWriter;
+import org.neo4j.values.storable.ValueWriter;
 
 /**
  * Cursor for scanning the properties of a node or edge.

diff --git a/community/kernel-api/src/main/java/org/neo4j/impl/kernel/api/Write.java b/community/kernel-api/src/main/java/org/neo4j/impl/kernel/api/Write.java
@@ -19,7 +19,7 @@
  */
 package org.neo4j.impl.kernel.api;
 
-import org.neo4j.values.Value;
+import org.neo4j.values.storable.Value;
 
 /**
  * Defines the write operations of the Kernel API.

diff --git a/community/kernel-api/src/test/java/org/neo4j/impl/kernel/api/PropertyCursorTestBase.java b/community/kernel-api/src/test/java/org/neo4j/impl/kernel/api/PropertyCursorTestBase.java
@@ -26,8 +26,8 @@
 import java.util.Map;
 
 import org.neo4j.function.ThrowingAction;
-import org.neo4j.values.BufferValueWriter;
+import org.neo4j.values.storable.BufferValueWriter;
-import org.neo4j.values.Values;
+import org.neo4j.values.storable.Values;
 
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.MatcherAssert.assertThat;

diff --git a/...prise/runtime/neole/src/main/java/org/neo4j/impl/store/prototype/neole/CursorFactory.java b/...prise/runtime/neole/src/main/java/org/neo4j/impl/store/prototype/neole/CursorFactory.java
@@ -19,9 +19,9 @@
  */
 package org.neo4j.impl.store.prototype.neole;
 
-import org.neo4j.impl.kernel.api.EdgeSearchStructureCursor;
+import org.neo4j.impl.kernel.api.EdgeManualIndexCursor;
 import org.neo4j.impl.kernel.api.NodeLabelIndexCursor;
-import org.neo4j.impl.kernel.api.NodeSearchStructureCursor;
+import org.neo4j.impl.kernel.api.NodeManualIndexCursor;
 import org.neo4j.impl.kernel.api.NodeValueIndexCursor;
 
 class CursorFactory implements org.neo4j.impl.kernel.api.CursorFactory
@@ -76,13 +76,13 @@ public NodeLabelIndexCursor allocateNodeLabelIndexCursor()
     }
 
     @Override
-    public NodeSearchStructureCursor allocateNodeSearchStructureCursor()
+    public NodeManualIndexCursor allocateNodeManualIndexCursor()
     {
         throw new UnsupportedOperationException( "not implemented" );
     }
 
     @Override
-    public EdgeSearchStructureCursor allocateEdgeSearchStructureCursor()
+    public EdgeManualIndexCursor allocateEdgeManualIndexCursor()
     {
         throw new UnsupportedOperationException( "not implemented" );
     }

diff --git a/...ntime/neole/src/main/java/org/neo4j/impl/store/prototype/neole/PartialPropertyCursor.java b/...ntime/neole/src/main/java/org/neo4j/impl/store/prototype/neole/PartialPropertyCursor.java
@@ -22,7 +22,7 @@
 import java.util.regex.Pattern;
 
 import org.neo4j.impl.store.cursors.ReadCursor;
-import org.neo4j.values.ValueWriter;
+import org.neo4j.values.storable.ValueWriter;
 
 public abstract class PartialPropertyCursor extends ReadCursor
         implements org.neo4j.impl.kernel.api.PropertyCursor

diff --git a/...rise/runtime/neole/src/main/java/org/neo4j/impl/store/prototype/neole/PropertyCursor.java b/...rise/runtime/neole/src/main/java/org/neo4j/impl/store/prototype/neole/PropertyCursor.java
@@ -20,10 +20,9 @@
 package org.neo4j.impl.store.prototype.neole;
 
 import org.neo4j.string.UTF8;
-import org.neo4j.values.Value;
+import org.neo4j.values.storable.Value;
-import org.neo4j.values.ValueGroup;
+import org.neo4j.values.storable.ValueGroup;
-import org.neo4j.values.ValueWriter;
+import org.neo4j.values.storable.Values;
-import org.neo4j.values.Values;
 
 import static org.neo4j.impl.store.prototype.neole.ReadStore.combineReference;
 import static org.neo4j.impl.store.prototype.neole.ShortStringEncoding.ENCODINGS;

diff --git a/enterprise/runtime/neole/src/test/java/org/neo4j/impl/store/prototype/neole/GraphSetup.java b/enterprise/runtime/neole/src/test/java/org/neo4j/impl/store/prototype/neole/GraphSetup.java
@@ -31,14 +31,14 @@
 import org.neo4j.graphdb.factory.GraphDatabaseBuilder;
 import org.neo4j.graphdb.factory.GraphDatabaseFactory;
 import org.neo4j.impl.kernel.api.EdgeGroupCursor;
+import org.neo4j.impl.kernel.api.EdgeManualIndexCursor;
 import org.neo4j.impl.kernel.api.EdgeScanCursor;
-import org.neo4j.impl.kernel.api.EdgeSearchStructureCursor;
 import org.neo4j.impl.kernel.api.EdgeTraversalCursor;
 import org.neo4j.impl.kernel.api.IndexPredicate;
 import org.neo4j.impl.kernel.api.IndexReference;
 import org.neo4j.impl.kernel.api.NodeCursor;
 import org.neo4j.impl.kernel.api.NodeLabelIndexCursor;
-import org.neo4j.impl.kernel.api.NodeSearchStructureCursor;
+import org.neo4j.impl.kernel.api.NodeManualIndexCursor;
 import org.neo4j.impl.kernel.api.NodeValueIndexCursor;
 import org.neo4j.impl.kernel.api.PropertyCursor;
 import org.neo4j.impl.kernel.api.Read;
@@ -275,14 +275,14 @@ public NodeLabelIndexCursor allocateNodeLabelIndexCursor()
     }
 
     @Override
-    public NodeSearchStructureCursor allocateNodeSearchStructureCursor()
+    public NodeManualIndexCursor allocateNodeManualIndexCursor()
     {
-        return cursors.allocateNodeSearchStructureCursor();
+        return cursors.allocateNodeManualIndexCursor();
     }
 
     @Override
-    public EdgeSearchStructureCursor allocateEdgeSearchStructureCursor()
+    public EdgeManualIndexCursor allocateEdgeManualIndexCursor()
     {
-        return cursors.allocateEdgeSearchStructureCursor();
+        return cursors.allocateEdgeManualIndexCursor();
     }
 }
diff --git a/.../runtime/neole/src/test/java/org/neo4j/impl/store/prototype/neole/PropertyCursorTest.java b/.../runtime/neole/src/test/java/org/neo4j/impl/store/prototype/neole/PropertyCursorTest.java
@@ -30,7 +30,7 @@
 import org.neo4j.graphdb.Transaction;
 import org.neo4j.impl.kernel.api.NodeCursor;
 import org.neo4j.impl.kernel.api.PropertyCursor;
-import org.neo4j.values.Values;
+import org.neo4j.values.storable.Values;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;