From a05897b973b4bb5ffbed74b2c66556e524363dcf Mon Sep 17 00:00:00 2001 From: MishaDemianenko Date: Mon, 21 Aug 2017 19:11:17 +0200 Subject: [PATCH] Fix post values merge compilation failures --- .../neo4j/impl/kernel/api/NodeValueIndexCursor.java | 2 +- .../org/neo4j/impl/kernel/api/PropertyCursor.java | 6 +++--- .../main/java/org/neo4j/impl/kernel/api/Write.java | 2 +- .../impl/kernel/api/PropertyCursorTestBase.java | 4 ++-- .../impl/store/prototype/neole/CursorFactory.java | 8 ++++---- .../store/prototype/neole/PartialPropertyCursor.java | 2 +- .../impl/store/prototype/neole/PropertyCursor.java | 7 +++---- .../neo4j/impl/store/prototype/neole/GraphSetup.java | 12 ++++++------ .../store/prototype/neole/PropertyCursorTest.java | 2 +- 9 files changed, 22 insertions(+), 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 index 7e33971525f87..8f5a1920ef353 100644 --- 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 index 9963c7e15b2a6..2616b5cec389b 100644 --- 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.ValueGroup; -import org.neo4j.values.ValueWriter; +import org.neo4j.values.storable.Value; +import org.neo4j.values.storable.ValueGroup; +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 index 94e4196861ec8..4c2c3c7c661e4 100644 --- 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 index d8f2325ee3e63..9ab5760d2d218 100644 --- 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.Values; +import org.neo4j.values.storable.BufferValueWriter; +import org.neo4j.values.storable.Values; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/enterprise/runtime/neole/src/main/java/org/neo4j/impl/store/prototype/neole/CursorFactory.java b/enterprise/runtime/neole/src/main/java/org/neo4j/impl/store/prototype/neole/CursorFactory.java index e1b69176c499f..f9ffa8e329e4a 100644 --- a/enterprise/runtime/neole/src/main/java/org/neo4j/impl/store/prototype/neole/CursorFactory.java +++ b/enterprise/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/enterprise/runtime/neole/src/main/java/org/neo4j/impl/store/prototype/neole/PartialPropertyCursor.java b/enterprise/runtime/neole/src/main/java/org/neo4j/impl/store/prototype/neole/PartialPropertyCursor.java index 0803fe9f9fe5a..c008c541b7de9 100644 --- a/enterprise/runtime/neole/src/main/java/org/neo4j/impl/store/prototype/neole/PartialPropertyCursor.java +++ b/enterprise/runtime/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/enterprise/runtime/neole/src/main/java/org/neo4j/impl/store/prototype/neole/PropertyCursor.java b/enterprise/runtime/neole/src/main/java/org/neo4j/impl/store/prototype/neole/PropertyCursor.java index 3dbe168a7243e..90a4708078f5e 100644 --- a/enterprise/runtime/neole/src/main/java/org/neo4j/impl/store/prototype/neole/PropertyCursor.java +++ b/enterprise/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.ValueGroup; -import org.neo4j.values.ValueWriter; -import org.neo4j.values.Values; +import org.neo4j.values.storable.Value; +import org.neo4j.values.storable.ValueGroup; +import org.neo4j.values.storable.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 index d92b5282b5673..f15afeb29af06 100644 --- 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/enterprise/runtime/neole/src/test/java/org/neo4j/impl/store/prototype/neole/PropertyCursorTest.java b/enterprise/runtime/neole/src/test/java/org/neo4j/impl/store/prototype/neole/PropertyCursorTest.java index 17c6a1a03d387..98d6613d1dc86 100644 --- a/enterprise/runtime/neole/src/test/java/org/neo4j/impl/store/prototype/neole/PropertyCursorTest.java +++ b/enterprise/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;