Moved QueryResult to Cypher

neo4j · Aug 31, 2017 · db149c7 · db149c7
1 parent a6db171
commit db149c7
Show file tree

Hide file tree

Showing 46 changed files with 54 additions and 54 deletions.
diff --git a/community/bolt/src/main/java/org/neo4j/bolt/v1/messaging/BoltMessageRouter.java b/community/bolt/src/main/java/org/neo4j/bolt/v1/messaging/BoltMessageRouter.java
@@ -25,9 +25,9 @@
 import org.neo4j.bolt.v1.runtime.BoltWorker;
 import org.neo4j.bolt.v1.runtime.Neo4jError;
 import org.neo4j.bolt.v1.runtime.spi.BoltResult;
+import org.neo4j.cypher.result.QueryResult;
 import org.neo4j.logging.Log;
 import org.neo4j.values.AnyValue;
-import org.neo4j.values.result.QueryResult;
 
 /**
  * This class is responsible for routing incoming request messages to a worker

diff --git a/community/bolt/src/main/java/org/neo4j/bolt/v1/messaging/BoltResponseMessageHandler.java b/community/bolt/src/main/java/org/neo4j/bolt/v1/messaging/BoltResponseMessageHandler.java
@@ -19,8 +19,8 @@
  */
 package org.neo4j.bolt.v1.messaging;
 
+import org.neo4j.cypher.result.QueryResult;
 import org.neo4j.kernel.api.exceptions.Status;
-import org.neo4j.values.result.QueryResult;
 import org.neo4j.values.virtual.MapValue;
 
 /**

diff --git a/community/bolt/src/main/java/org/neo4j/bolt/v1/messaging/BoltResponseMessageWriter.java b/community/bolt/src/main/java/org/neo4j/bolt/v1/messaging/BoltResponseMessageWriter.java
@@ -21,9 +21,9 @@
 
 import java.io.IOException;
 
+import org.neo4j.cypher.result.QueryResult;
 import org.neo4j.kernel.api.exceptions.Status;
 import org.neo4j.values.AnyValue;
-import org.neo4j.values.result.QueryResult;
 import org.neo4j.values.virtual.MapValue;
 
 import static org.neo4j.bolt.v1.messaging.BoltResponseMessage.FAILURE;

diff --git a/community/bolt/src/main/java/org/neo4j/bolt/v1/messaging/Neo4jPack.java b/community/bolt/src/main/java/org/neo4j/bolt/v1/messaging/Neo4jPack.java
@@ -32,13 +32,13 @@
 import org.neo4j.bolt.v1.packstream.PackType;
 import org.neo4j.bolt.v1.runtime.Neo4jError;
 import org.neo4j.collection.primitive.PrimitiveLongIntKeyValueArray;
+import org.neo4j.cypher.internal.javacompat.BaseToObjectValueWriter;
 import org.neo4j.graphdb.Node;
 import org.neo4j.graphdb.Relationship;
 import org.neo4j.graphdb.spatial.Point;
 import org.neo4j.kernel.api.exceptions.Status;
 import org.neo4j.values.AnyValue;
 import org.neo4j.values.AnyValueWriter;
-import org.neo4j.values.BaseToObjectValueWriter;
 import org.neo4j.values.storable.TextArray;
 import org.neo4j.values.storable.TextValue;
 import org.neo4j.values.storable.Values;

diff --git a/community/bolt/src/main/java/org/neo4j/bolt/v1/runtime/CypherAdapterStream.java b/community/bolt/src/main/java/org/neo4j/bolt/v1/runtime/CypherAdapterStream.java
@@ -27,13 +27,13 @@
 
 import org.neo4j.bolt.v1.messaging.BoltIOException;
 import org.neo4j.bolt.v1.runtime.spi.BoltResult;
+import org.neo4j.cypher.result.QueryResult;
 import org.neo4j.graphdb.ExecutionPlanDescription;
 import org.neo4j.graphdb.InputPosition;
 import org.neo4j.graphdb.Notification;
 import org.neo4j.graphdb.QueryExecutionType;
 import org.neo4j.graphdb.QueryStatistics;
 import org.neo4j.values.AnyValue;
-import org.neo4j.values.result.QueryResult;
 import org.neo4j.values.storable.Values;
 import org.neo4j.values.virtual.MapValue;
 import org.neo4j.values.virtual.VirtualValues;

diff --git a/community/bolt/src/main/java/org/neo4j/bolt/v1/runtime/TransactionStateMachineSPI.java b/community/bolt/src/main/java/org/neo4j/bolt/v1/runtime/TransactionStateMachineSPI.java
@@ -27,6 +27,7 @@
 import org.neo4j.bolt.v1.runtime.TransactionStateMachine.BoltResultHandle;
 import org.neo4j.bolt.v1.runtime.spi.BoltResult;
 import org.neo4j.cypher.internal.javacompat.ExecutionResult;
+import org.neo4j.cypher.result.QueryResult;
 import org.neo4j.function.ThrowingAction;
 import org.neo4j.kernel.AvailabilityGuard;
 import org.neo4j.kernel.GraphDatabaseQueryService;
@@ -47,7 +48,6 @@
 import org.neo4j.kernel.impl.query.clientconnection.ClientConnectionInfo;
 import org.neo4j.kernel.impl.transaction.log.TransactionIdStore;
 import org.neo4j.kernel.internal.GraphDatabaseAPI;
-import org.neo4j.values.result.QueryResult;
 
 import static org.neo4j.kernel.api.KernelTransaction.Type.implicit;
 

diff --git a/community/bolt/src/main/java/org/neo4j/bolt/v1/runtime/spi/BoltResult.java b/community/bolt/src/main/java/org/neo4j/bolt/v1/runtime/spi/BoltResult.java
@@ -19,8 +19,8 @@
  */
 package org.neo4j.bolt.v1.runtime.spi;
 
+import org.neo4j.cypher.result.QueryResult;
 import org.neo4j.values.AnyValue;
-import org.neo4j.values.result.QueryResult;
 
 /**
  * Represents a data stream of records, this is the output cypher produces.

diff --git a/community/bolt/src/main/java/org/neo4j/bolt/v1/runtime/spi/ImmutableRecord.java b/community/bolt/src/main/java/org/neo4j/bolt/v1/runtime/spi/ImmutableRecord.java
@@ -21,8 +21,8 @@
 
 import java.util.Arrays;
 
+import org.neo4j.cypher.result.QueryResult;
 import org.neo4j.values.AnyValue;
-import org.neo4j.values.result.QueryResult;
 
 public class ImmutableRecord implements QueryResult.Record
 {

diff --git a/community/bolt/src/main/java/org/neo4j/bolt/v1/runtime/spi/Records.java b/community/bolt/src/main/java/org/neo4j/bolt/v1/runtime/spi/Records.java
@@ -19,8 +19,8 @@
  */
 package org.neo4j.bolt.v1.runtime.spi;
 
+import org.neo4j.cypher.result.QueryResult;
 import org.neo4j.values.AnyValue;
-import org.neo4j.values.result.QueryResult;
 
 public class Records
 {

diff --git a/community/bolt/src/test/java/org/neo4j/bolt/testing/BoltMatchers.java b/community/bolt/src/test/java/org/neo4j/bolt/testing/BoltMatchers.java
@@ -31,11 +31,11 @@
 import org.neo4j.bolt.v1.runtime.BoltStateMachine;
 import org.neo4j.bolt.v1.runtime.StatementProcessor;
 import org.neo4j.cypher.internal.javacompat.ValueUtils;
+import org.neo4j.cypher.result.QueryResult;
 import org.neo4j.function.ThrowingAction;
 import org.neo4j.function.ThrowingBiConsumer;
 import org.neo4j.kernel.api.exceptions.Status;
 import org.neo4j.values.AnyValue;
-import org.neo4j.values.result.QueryResult;
 import org.neo4j.values.storable.TextValue;
 
 import static java.lang.String.format;

diff --git a/community/bolt/src/test/java/org/neo4j/bolt/testing/BoltResponseRecorder.java b/community/bolt/src/test/java/org/neo4j/bolt/testing/BoltResponseRecorder.java
@@ -25,8 +25,8 @@
 import org.neo4j.bolt.v1.runtime.BoltResponseHandler;
 import org.neo4j.bolt.v1.runtime.Neo4jError;
 import org.neo4j.bolt.v1.runtime.spi.BoltResult;
+import org.neo4j.cypher.result.QueryResult;
 import org.neo4j.values.AnyValue;
-import org.neo4j.values.result.QueryResult;
 
 import static java.util.concurrent.TimeUnit.SECONDS;
 import static org.junit.Assert.assertNotNull;

diff --git a/community/bolt/src/test/java/org/neo4j/bolt/testing/RecordedBoltResponse.java b/community/bolt/src/test/java/org/neo4j/bolt/testing/RecordedBoltResponse.java
@@ -25,8 +25,8 @@
 import java.util.Map;
 
 import org.neo4j.bolt.v1.messaging.BoltResponseMessage;
+import org.neo4j.cypher.result.QueryResult;
 import org.neo4j.values.AnyValue;
-import org.neo4j.values.result.QueryResult;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.lessThan;

diff --git a/community/bolt/src/test/java/org/neo4j/bolt/v1/messaging/BoltResponseMessageRecorder.java b/community/bolt/src/test/java/org/neo4j/bolt/v1/messaging/BoltResponseMessageRecorder.java
@@ -24,8 +24,8 @@
 import org.neo4j.bolt.v1.messaging.message.RecordMessage;
 import org.neo4j.bolt.v1.messaging.message.ResponseMessage;
 import org.neo4j.bolt.v1.messaging.message.SuccessMessage;
+import org.neo4j.cypher.result.QueryResult;
 import org.neo4j.kernel.api.exceptions.Status;
-import org.neo4j.values.result.QueryResult;
 import org.neo4j.values.virtual.MapValue;
 
 public class BoltResponseMessageRecorder extends MessageRecorder<ResponseMessage> implements BoltResponseMessageHandler<RuntimeException>

diff --git a/community/bolt/src/test/java/org/neo4j/bolt/v1/messaging/message/RecordMessage.java b/community/bolt/src/test/java/org/neo4j/bolt/v1/messaging/message/RecordMessage.java
@@ -20,7 +20,7 @@
 package org.neo4j.bolt.v1.messaging.message;
 
 import org.neo4j.bolt.v1.messaging.BoltResponseMessageHandler;
-import org.neo4j.values.result.QueryResult;
+import org.neo4j.cypher.result.QueryResult;
 
 public class RecordMessage implements ResponseMessage
 {

diff --git a/community/bolt/src/test/java/org/neo4j/bolt/v1/messaging/util/MessageMatchers.java b/community/bolt/src/test/java/org/neo4j/bolt/v1/messaging/util/MessageMatchers.java
@@ -49,15 +49,15 @@
 import org.neo4j.bolt.v1.packstream.BufferedChannelInput;
 import org.neo4j.bolt.v1.packstream.BufferedChannelOutput;
 import org.neo4j.bolt.v1.transport.integration.TestNotification;
+import org.neo4j.cypher.internal.javacompat.BaseToObjectValueWriter;
+import org.neo4j.cypher.result.QueryResult;
 import org.neo4j.graphdb.Node;
 import org.neo4j.graphdb.Notification;
 import org.neo4j.graphdb.Relationship;
 import org.neo4j.graphdb.spatial.Point;
 import org.neo4j.kernel.api.exceptions.Status;
 import org.neo4j.kernel.impl.util.HexPrinter;
 import org.neo4j.values.AnyValue;
-import org.neo4j.values.BaseToObjectValueWriter;
-import org.neo4j.values.result.QueryResult;
 import org.neo4j.values.virtual.MapValue;
 
 import static org.hamcrest.CoreMatchers.containsString;

diff --git a/community/bolt/src/test/java/org/neo4j/bolt/v1/runtime/CypherAdapterStreamTest.java b/community/bolt/src/test/java/org/neo4j/bolt/v1/runtime/CypherAdapterStreamTest.java
@@ -31,13 +31,13 @@
 import java.util.Set;
 
 import org.neo4j.bolt.v1.runtime.spi.BoltResult;
+import org.neo4j.cypher.result.QueryResult;
 import org.neo4j.graphdb.ExecutionPlanDescription;
 import org.neo4j.graphdb.InputPosition;
 import org.neo4j.graphdb.QueryStatistics;
 import org.neo4j.graphdb.impl.notification.NotificationCode;
 import org.neo4j.kernel.impl.query.TransactionalContext;
 import org.neo4j.values.AnyValue;
-import org.neo4j.values.result.QueryResult;
 import org.neo4j.values.storable.DoubleValue;
 import org.neo4j.values.virtual.MapValue;
 import org.neo4j.values.virtual.VirtualValues;

diff --git a/community/bolt/src/test/java/org/neo4j/bolt/v1/runtime/ResetFuzzTest.java b/community/bolt/src/test/java/org/neo4j/bolt/v1/runtime/ResetFuzzTest.java
@@ -40,13 +40,13 @@
 import org.neo4j.bolt.v1.messaging.message.RequestMessage;
 import org.neo4j.bolt.v1.runtime.concurrent.ThreadedWorkerFactory;
 import org.neo4j.concurrent.Runnables;
+import org.neo4j.cypher.result.QueryResult;
 import org.neo4j.helpers.collection.Iterables;
 import org.neo4j.kernel.api.exceptions.Status;
 import org.neo4j.kernel.impl.logging.NullLogService;
 import org.neo4j.kernel.impl.util.Neo4jJobScheduler;
 import org.neo4j.kernel.lifecycle.LifeSupport;
 import org.neo4j.logging.NullLog;
-import org.neo4j.values.result.QueryResult;
 import org.neo4j.values.virtual.MapValue;
 
 import static java.util.Arrays.asList;

diff --git a/community/bolt/src/test/java/org/neo4j/bolt/v1/runtime/integration/BoltConnectionIT.java b/community/bolt/src/test/java/org/neo4j/bolt/v1/runtime/integration/BoltConnectionIT.java
@@ -38,9 +38,9 @@
 import org.neo4j.bolt.v1.runtime.BoltStateMachine;
 import org.neo4j.bolt.v1.runtime.Neo4jError;
 import org.neo4j.bolt.v1.runtime.spi.BoltResult;
+import org.neo4j.cypher.result.QueryResult.Record;
 import org.neo4j.kernel.api.exceptions.Status;
 import org.neo4j.values.AnyValue;
-import org.neo4j.values.result.QueryResult.Record;
 import org.neo4j.values.storable.LongValue;
 
 import static java.util.Collections.emptyMap;

diff --git a/community/bolt/src/test/java/org/neo4j/bolt/v1/runtime/spi/StreamMatchers.java b/community/bolt/src/test/java/org/neo4j/bolt/v1/runtime/spi/StreamMatchers.java
@@ -27,8 +27,8 @@
 import java.util.Iterator;
 import java.util.concurrent.atomic.AtomicBoolean;
 
+import org.neo4j.cypher.result.QueryResult;
 import org.neo4j.values.AnyValue;
-import org.neo4j.values.result.QueryResult;
 import org.neo4j.values.storable.NumberValue;
 
 import static java.util.Arrays.asList;

diff --git a/...neo4j/values/BaseToObjectValueWriter.java → ...l/javacompat/BaseToObjectValueWriter.java b/...neo4j/values/BaseToObjectValueWriter.java → ...l/javacompat/BaseToObjectValueWriter.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.values;
+package org.neo4j.cypher.internal.javacompat;
 
 import java.lang.reflect.Array;
 import java.util.ArrayDeque;
@@ -35,6 +35,7 @@
 import org.neo4j.graphdb.spatial.Point;
 import org.neo4j.helpers.collection.ReverseArrayIterator;
 import org.neo4j.string.UTF8;
+import org.neo4j.values.AnyValueWriter;
 import org.neo4j.values.storable.TextArray;
 import org.neo4j.values.storable.TextValue;
 import org.neo4j.values.virtual.CoordinateReferenceSystem;

diff --git a/...ity/cypher/cypher/src/main/java/org/neo4j/cypher/internal/javacompat/ExecutionResult.java b/...ity/cypher/cypher/src/main/java/org/neo4j/cypher/internal/javacompat/ExecutionResult.java
@@ -29,6 +29,7 @@
 
 import org.neo4j.cypher.CypherException;
 import org.neo4j.cypher.internal.InternalExecutionResult;
+import org.neo4j.cypher.result.QueryResult;
 import org.neo4j.graphdb.ExecutionPlanDescription;
 import org.neo4j.graphdb.Notification;
 import org.neo4j.graphdb.QueryExecutionException;
@@ -40,7 +41,6 @@
 import org.neo4j.graphdb.Result;
 import org.neo4j.kernel.impl.query.QueryExecutionEngine;
 import org.neo4j.kernel.impl.query.QueryExecutionKernelException;
-import org.neo4j.values.result.QueryResult;
 
 /**
  * Holds Cypher query result sets, in tabular form. Each row of the result is a map

diff --git a/community/cypher/cypher/src/main/java/org/neo4j/cypher/internal/javacompat/ResultRecord.java b/community/cypher/cypher/src/main/java/org/neo4j/cypher/internal/javacompat/ResultRecord.java
@@ -19,8 +19,8 @@
  */
 package org.neo4j.cypher.internal.javacompat;
 
+import org.neo4j.cypher.result.QueryResult;
 import org.neo4j.values.AnyValue;
-import org.neo4j.values.result.QueryResult;
 
 public class ResultRecord implements QueryResult.Record
 {

diff --git a/...er/cypher/src/main/java/org/neo4j/cypher/internal/javacompat/ValueToObjectSerializer.java b/...er/cypher/src/main/java/org/neo4j/cypher/internal/javacompat/ValueToObjectSerializer.java
@@ -25,7 +25,6 @@
 import org.neo4j.graphdb.Relationship;
 import org.neo4j.graphdb.spatial.Point;
 import org.neo4j.kernel.impl.core.NodeManager;
-import org.neo4j.values.BaseToObjectValueWriter;
 
 public class ValueToObjectSerializer extends BaseToObjectValueWriter<RuntimeException>
 {

diff --git a/.../org/neo4j/values/result/QueryResult.java → .../org/neo4j/cypher/result/QueryResult.java b/.../org/neo4j/values/result/QueryResult.java → .../org/neo4j/cypher/result/QueryResult.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.values.result;
+package org.neo4j.cypher.result;
 
 import org.neo4j.graphdb.ExecutionPlanDescription;
 import org.neo4j.graphdb.Notification;

diff --git a/...nity/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/InternalExecutionResult.scala b/...nity/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/InternalExecutionResult.scala
@@ -25,9 +25,9 @@ import java.{lang, util}
 import org.neo4j.cypher.internal.compatibility.v3_3.runtime.executionplan._
 import org.neo4j.cypher.internal.compatibility.v3_3.runtime.planDescription.InternalPlanDescription
 import org.neo4j.cypher.internal.compatibility.v3_3.runtime.{ExecutionMode, ExplainMode, NormalMode, ProfileMode}
+import org.neo4j.cypher.result.QueryResult
 import org.neo4j.graphdb.Result.ResultVisitor
 import org.neo4j.graphdb._
-import org.neo4j.values.result.QueryResult
 
 import scala.collection.JavaConverters._
 

diff --git a/...ypher/src/main/scala/org/neo4j/cypher/internal/compatibility/ClosingExecutionResult.scala b/...ypher/src/main/scala/org/neo4j/cypher/internal/compatibility/ClosingExecutionResult.scala
@@ -25,12 +25,12 @@ import org.neo4j.cypher.internal.InternalExecutionResult
 import org.neo4j.cypher.internal.compatibility.v3_3.runtime.ExecutionMode
 import org.neo4j.cypher.internal.compatibility.v3_3.runtime.executionplan.InternalQueryType
 import org.neo4j.cypher.internal.compatibility.v3_3.runtime.planDescription.InternalPlanDescription
+import org.neo4j.cypher.result.QueryResult.QueryResultVisitor
 import org.neo4j.graphdb
 import org.neo4j.graphdb.Result.ResultVisitor
 import org.neo4j.graphdb.{Notification, ResourceIterator}
 import org.neo4j.kernel.api.query.ExecutingQuery
 import org.neo4j.kernel.impl.query.QueryExecutionMonitor
-import org.neo4j.values.result.QueryResult.QueryResultVisitor
 
 class ClosingExecutionResult(val query: ExecutingQuery, val inner: InternalExecutionResult, runSafely: RunSafely)
                             (implicit innerMonitor: QueryExecutionMonitor)

diff --git a/.../src/main/scala/org/neo4j/cypher/internal/compatibility/v2_3/ExecutionResultWrapper.scala b/.../src/main/scala/org/neo4j/cypher/internal/compatibility/v2_3/ExecutionResultWrapper.scala
@@ -38,12 +38,12 @@ import org.neo4j.cypher.internal.frontend.v2_3.{InputPosition => InternalInputPo
 import org.neo4j.cypher.internal.frontend.{v2_3, v3_3}
 import org.neo4j.cypher.internal.javacompat.ValueUtils
 import org.neo4j.cypher.internal.{QueryStatistics, compatibility}
+import org.neo4j.cypher.result.QueryResult
+import org.neo4j.cypher.result.QueryResult.Record
 import org.neo4j.graphdb.Result.ResultVisitor
 import org.neo4j.graphdb._
 import org.neo4j.graphdb.impl.notification.{NotificationCode, NotificationDetail}
 import org.neo4j.values.AnyValue
-import org.neo4j.values.result.QueryResult
-import org.neo4j.values.result.QueryResult.Record
 
 import scala.collection.JavaConverters._
 

diff --git a/.../src/main/scala/org/neo4j/cypher/internal/compatibility/v3_1/ExecutionResultWrapper.scala b/.../src/main/scala/org/neo4j/cypher/internal/compatibility/v3_1/ExecutionResultWrapper.scala
@@ -38,13 +38,13 @@ import org.neo4j.cypher.internal.frontend.v3_1.SemanticDirection.{BOTH, INCOMING
 import org.neo4j.cypher.internal.frontend.v3_1.notification.{DeprecatedPlannerNotification, InternalNotification, PlannerUnsupportedNotification, RuntimeUnsupportedNotification, _}
 import org.neo4j.cypher.internal.frontend.v3_3
 import org.neo4j.cypher.internal.javacompat.ValueUtils
+import org.neo4j.cypher.result.QueryResult
+import org.neo4j.cypher.result.QueryResult.Record
 import org.neo4j.graphdb
 import org.neo4j.graphdb.Result.{ResultRow, ResultVisitor}
 import org.neo4j.graphdb.impl.notification.{NotificationCode, NotificationDetail}
 import org.neo4j.graphdb.{InputPosition, Notification, ResourceIterator}
 import org.neo4j.values.AnyValue
-import org.neo4j.values.result.QueryResult
-import org.neo4j.values.result.QueryResult.Record
 
 import scala.collection.JavaConverters._
 

diff --git a/.../src/main/scala/org/neo4j/cypher/internal/compatibility/v3_2/ExecutionResultWrapper.scala b/.../src/main/scala/org/neo4j/cypher/internal/compatibility/v3_2/ExecutionResultWrapper.scala
@@ -39,13 +39,13 @@ import org.neo4j.cypher.internal.frontend.v3_2.SemanticDirection.{BOTH, INCOMING
 import org.neo4j.cypher.internal.frontend.v3_2.notification.{DeprecatedPlannerNotification, InternalNotification, PlannerUnsupportedNotification, RuntimeUnsupportedNotification, _}
 import org.neo4j.cypher.internal.frontend.v3_3
 import org.neo4j.cypher.internal.javacompat.ValueUtils
+import org.neo4j.cypher.result.QueryResult
+import org.neo4j.cypher.result.QueryResult.Record
 import org.neo4j.graphdb
 import org.neo4j.graphdb.Result.{ResultRow, ResultVisitor}
 import org.neo4j.graphdb.impl.notification.{NotificationCode, NotificationDetail}
 import org.neo4j.graphdb.{Notification, ResourceIterator}
 import org.neo4j.values.AnyValue
-import org.neo4j.values.result.QueryResult
-import org.neo4j.values.result.QueryResult.Record
 
 import scala.collection.JavaConverters._
 

diff --git a/...n/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/ExplainExecutionResult.scala b/...n/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/ExplainExecutionResult.scala
@@ -26,9 +26,9 @@ import java.util.Collections
 import org.neo4j.cypher.internal.compatibility.v3_3.runtime.executionplan.InternalQueryType
 import org.neo4j.cypher.internal.compatibility.v3_3.runtime.planDescription.InternalPlanDescription
 import org.neo4j.cypher.internal.{InternalExecutionResult, QueryStatistics}
+import org.neo4j.cypher.result.QueryResult.QueryResultVisitor
 import org.neo4j.graphdb.Result.ResultVisitor
 import org.neo4j.graphdb.{Notification, ResourceIterator}
-import org.neo4j.values.result.QueryResult.QueryResultVisitor
 
 case class ExplainExecutionResult(fieldNames: Array[String],
                                   executionPlanDescription: InternalPlanDescription,

diff --git a/...main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/PipeExecutionResult.scala b/...main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/PipeExecutionResult.scala
@@ -30,10 +30,10 @@ import org.neo4j.cypher.internal.compatibility.v3_3.runtime.planDescription.Inte
 import org.neo4j.cypher.internal.compatibility.v3_3.runtime.planDescription.InternalPlanDescription.Arguments.Version
 import org.neo4j.cypher.internal.frontend.v3_3.helpers.Eagerly.immutableMapValues
 import org.neo4j.cypher.internal.spi.v3_3.QueryContext
+import org.neo4j.cypher.result.QueryResult
+import org.neo4j.cypher.result.QueryResult.QueryResultVisitor
 import org.neo4j.graphdb.Result.ResultVisitor
 import org.neo4j.graphdb.{NotFoundException, Notification, ResourceIterator}
-import org.neo4j.values.result.QueryResult
-import org.neo4j.values.result.QueryResult.QueryResultVisitor
 
 import scala.collection.JavaConverters._
 import scala.collection.Map

diff --git a/...r/internal/compatibility/v3_3/runtime/executionplan/StandardInternalExecutionResult.scala b/...r/internal/compatibility/v3_3/runtime/executionplan/StandardInternalExecutionResult.scala
@@ -30,10 +30,10 @@ import org.neo4j.cypher.internal.frontend.v3_3.PlannerName
 import org.neo4j.cypher.internal.frontend.v3_3.helpers.Eagerly
 import org.neo4j.cypher.internal.spi.v3_3.QueryContext
 import org.neo4j.cypher.internal.{InternalExecutionResult, QueryStatistics}
+import org.neo4j.cypher.result.QueryResult
+import org.neo4j.cypher.result.QueryResult.QueryResultVisitor
 import org.neo4j.graphdb.Result.{ResultRow, ResultVisitor}
 import org.neo4j.graphdb._
-import org.neo4j.values.result.QueryResult
-import org.neo4j.values.result.QueryResult.QueryResultVisitor
 
 import scala.collection.{Map, mutable}