From db149c7cce6372fb1d2f6905b9de62c86147c359 Mon Sep 17 00:00:00 2001 From: Pontus Melke Date: Thu, 31 Aug 2017 14:38:18 +0200 Subject: [PATCH] Moved QueryResult to Cypher --- .../java/org/neo4j/bolt/v1/messaging/BoltMessageRouter.java | 2 +- .../neo4j/bolt/v1/messaging/BoltResponseMessageHandler.java | 2 +- .../neo4j/bolt/v1/messaging/BoltResponseMessageWriter.java | 2 +- .../src/main/java/org/neo4j/bolt/v1/messaging/Neo4jPack.java | 2 +- .../java/org/neo4j/bolt/v1/runtime/CypherAdapterStream.java | 2 +- .../neo4j/bolt/v1/runtime/TransactionStateMachineSPI.java | 2 +- .../main/java/org/neo4j/bolt/v1/runtime/spi/BoltResult.java | 2 +- .../java/org/neo4j/bolt/v1/runtime/spi/ImmutableRecord.java | 2 +- .../src/main/java/org/neo4j/bolt/v1/runtime/spi/Records.java | 2 +- .../src/test/java/org/neo4j/bolt/testing/BoltMatchers.java | 2 +- .../java/org/neo4j/bolt/testing/BoltResponseRecorder.java | 2 +- .../java/org/neo4j/bolt/testing/RecordedBoltResponse.java | 2 +- .../neo4j/bolt/v1/messaging/BoltResponseMessageRecorder.java | 2 +- .../org/neo4j/bolt/v1/messaging/message/RecordMessage.java | 2 +- .../org/neo4j/bolt/v1/messaging/util/MessageMatchers.java | 4 ++-- .../org/neo4j/bolt/v1/runtime/CypherAdapterStreamTest.java | 2 +- .../test/java/org/neo4j/bolt/v1/runtime/ResetFuzzTest.java | 2 +- .../neo4j/bolt/v1/runtime/integration/BoltConnectionIT.java | 2 +- .../java/org/neo4j/bolt/v1/runtime/spi/StreamMatchers.java | 2 +- .../cypher/internal/javacompat}/BaseToObjectValueWriter.java | 3 ++- .../neo4j/cypher/internal/javacompat/ExecutionResult.java | 2 +- .../org/neo4j/cypher/internal/javacompat/ResultRecord.java | 2 +- .../cypher/internal/javacompat/ValueToObjectSerializer.java | 1 - .../src/main/java/org/neo4j/cypher}/result/QueryResult.java | 2 +- .../org/neo4j/cypher/internal/InternalExecutionResult.scala | 2 +- .../internal/compatibility/ClosingExecutionResult.scala | 2 +- .../internal/compatibility/v2_3/ExecutionResultWrapper.scala | 4 ++-- .../internal/compatibility/v3_1/ExecutionResultWrapper.scala | 4 ++-- .../internal/compatibility/v3_2/ExecutionResultWrapper.scala | 4 ++-- .../compatibility/v3_3/runtime/ExplainExecutionResult.scala | 2 +- .../compatibility/v3_3/runtime/PipeExecutionResult.scala | 4 ++-- .../executionplan/StandardInternalExecutionResult.scala | 4 ++-- .../executionplan/procs/ProcedureExecutionResult.scala | 2 +- .../procs/PureSideEffectInternalExecutionResult.scala | 2 +- .../v3_3/runtime/helpers/RuntimeJavaValueConverter.scala | 2 +- .../neo4j/cypher/internal/RewindableExecutionResult.scala | 2 +- .../v3_3/runtime/helpers/RowIteratorVisitationTest.scala | 2 +- .../compatibility/v3_3/runtime/pipes/QueryStateHelper.scala | 3 ++- .../java/org/neo4j/values/storable/BufferValueWriter.java | 5 ++--- .../internal/v3_3/executionplan/GeneratedQueryExecution.java | 2 +- .../v3_3/runtime/compiled/CompiledExecutionResult.scala | 2 +- .../internal/spi/v3_3/codegen/GeneratedQueryStructure.scala | 2 +- .../org/neo4j/cypher/internal/spi/v3_3/codegen/Methods.scala | 2 +- .../v3_3/codegen/CompiledExecutionResultTest.scala | 2 +- .../enterprise/auth/ProcedureInteractionTestBase.java | 2 +- .../auth/integration/bolt/BoltConnectionManagementIT.java | 2 +- 46 files changed, 54 insertions(+), 54 deletions(-) rename community/{values/src/main/java/org/neo4j/values => cypher/cypher/src/main/java/org/neo4j/cypher/internal/javacompat}/BaseToObjectValueWriter.java (99%) rename community/{values/src/main/java/org/neo4j/values => cypher/cypher/src/main/java/org/neo4j/cypher}/result/QueryResult.java (97%) 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 index e58bb32097356..28ff78635d32d 100644 --- 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 index a7ee5b9d21480..47f949cb58d98 100644 --- 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 index 36a80c19b9903..8ddb8f52f1f80 100644 --- 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 index a745a86e9a408..ffe6294a160a7 100644 --- 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 index 4ed70fc5379bd..d6e831f6d6ccb 100644 --- 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 index f7aa3e8c3637d..b61bb7abbbe49 100644 --- 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 index 4a7db6211afd5..29f13ceea567d 100644 --- 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 index 2bc7e69fc3406..2c26e6d67f680 100644 --- 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 index 120a5b77b7fc6..cefd7f4f56275 100644 --- 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 index 9a00965c960d6..bb87d45e16a6a 100644 --- 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 index 3e191a8ae3490..21341d2570b1c 100644 --- 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 index 8af88716e3754..168e2070fbfad 100644 --- 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 index bf5edb9f9ee41..4658b3b6c8ac2 100644 --- 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 implements BoltResponseMessageHandler 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 index c96beca6053f4..10bd5d5514092 100644 --- 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 index 50d62d0688935..bbc9d0b4396d5 100644 --- 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,6 +49,8 @@ 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; @@ -56,8 +58,6 @@ 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 index ad85c23c4938c..2fb4f64afb1c3 100644 --- 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 index bacd3666b8b12..ce3f3221fa4a9 100644 --- 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 index 502db1960e89f..33e6e5014dc58 100644 --- 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 index b30b662841676..9c1502f18638c 100644 --- 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/community/values/src/main/java/org/neo4j/values/BaseToObjectValueWriter.java b/community/cypher/cypher/src/main/java/org/neo4j/cypher/internal/javacompat/BaseToObjectValueWriter.java similarity index 99% rename from community/values/src/main/java/org/neo4j/values/BaseToObjectValueWriter.java rename to community/cypher/cypher/src/main/java/org/neo4j/cypher/internal/javacompat/BaseToObjectValueWriter.java index f0b8632a905eb..f3c3d5e998361 100644 --- a/community/values/src/main/java/org/neo4j/values/BaseToObjectValueWriter.java +++ b/community/cypher/cypher/src/main/java/org/neo4j/cypher/internal/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 . */ -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/community/cypher/cypher/src/main/java/org/neo4j/cypher/internal/javacompat/ExecutionResult.java b/community/cypher/cypher/src/main/java/org/neo4j/cypher/internal/javacompat/ExecutionResult.java index fe01677348c1d..0c5b49894d91c 100644 --- a/community/cypher/cypher/src/main/java/org/neo4j/cypher/internal/javacompat/ExecutionResult.java +++ b/community/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 index a06e35fb48f36..42df634769236 100644 --- 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/community/cypher/cypher/src/main/java/org/neo4j/cypher/internal/javacompat/ValueToObjectSerializer.java b/community/cypher/cypher/src/main/java/org/neo4j/cypher/internal/javacompat/ValueToObjectSerializer.java index 60be553d9907b..4c3f4e08169d0 100644 --- a/community/cypher/cypher/src/main/java/org/neo4j/cypher/internal/javacompat/ValueToObjectSerializer.java +++ b/community/cypher/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 { diff --git a/community/values/src/main/java/org/neo4j/values/result/QueryResult.java b/community/cypher/cypher/src/main/java/org/neo4j/cypher/result/QueryResult.java similarity index 97% rename from community/values/src/main/java/org/neo4j/values/result/QueryResult.java rename to community/cypher/cypher/src/main/java/org/neo4j/cypher/result/QueryResult.java index 7de974fbbe5e7..23c03a30af862 100644 --- a/community/values/src/main/java/org/neo4j/values/result/QueryResult.java +++ b/community/cypher/cypher/src/main/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 . */ -package org.neo4j.values.result; +package org.neo4j.cypher.result; import org.neo4j.graphdb.ExecutionPlanDescription; import org.neo4j.graphdb.Notification; diff --git a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/InternalExecutionResult.scala b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/InternalExecutionResult.scala index d3ac688caab09..b7e847d88afb1 100644 --- a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/InternalExecutionResult.scala +++ b/community/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/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/ClosingExecutionResult.scala b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/ClosingExecutionResult.scala index d0e1c1820626c..21ce88b944c21 100644 --- a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/ClosingExecutionResult.scala +++ b/community/cypher/cypher/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/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v2_3/ExecutionResultWrapper.scala b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v2_3/ExecutionResultWrapper.scala index 20b104a9fd3a8..ddc4ecceafdd8 100644 --- a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v2_3/ExecutionResultWrapper.scala +++ b/community/cypher/cypher/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/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_1/ExecutionResultWrapper.scala b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_1/ExecutionResultWrapper.scala index 462c69b3e25ed..2d2e775842e3a 100644 --- a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_1/ExecutionResultWrapper.scala +++ b/community/cypher/cypher/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/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_2/ExecutionResultWrapper.scala b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_2/ExecutionResultWrapper.scala index dffdb2eb9c7a1..109aea065c700 100644 --- a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_2/ExecutionResultWrapper.scala +++ b/community/cypher/cypher/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/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/ExplainExecutionResult.scala b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/ExplainExecutionResult.scala index f5f953c110844..79f1d786daf63 100644 --- a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/ExplainExecutionResult.scala +++ b/community/cypher/cypher/src/main/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/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/PipeExecutionResult.scala b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/PipeExecutionResult.scala index 09aab268e1e73..0f3f32c9b4c21 100644 --- a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/PipeExecutionResult.scala +++ b/community/cypher/cypher/src/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/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/executionplan/StandardInternalExecutionResult.scala b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/executionplan/StandardInternalExecutionResult.scala index f82c126343377..bc0bb5817446f 100644 --- a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/executionplan/StandardInternalExecutionResult.scala +++ b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/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} diff --git a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/executionplan/procs/ProcedureExecutionResult.scala b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/executionplan/procs/ProcedureExecutionResult.scala index 9763a1201db49..eb1c1f91f88ba 100644 --- a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/executionplan/procs/ProcedureExecutionResult.scala +++ b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/executionplan/procs/ProcedureExecutionResult.scala @@ -32,10 +32,10 @@ import org.neo4j.cypher.internal.javacompat.ValueUtils import org.neo4j.cypher.internal.javacompat.ValueUtils.{fromNodeProxy, fromRelationshipProxy, _} import org.neo4j.cypher.internal.spi.v3_3.QueryContext import org.neo4j.cypher.internal.{InternalExecutionResult, QueryStatistics} +import org.neo4j.cypher.result.QueryResult.{QueryResultVisitor, Record} import org.neo4j.graphdb.Notification import org.neo4j.graphdb.spatial.{Geometry, Point} import org.neo4j.values.AnyValue -import org.neo4j.values.result.QueryResult.{QueryResultVisitor, Record} import org.neo4j.values.storable.Values import org.neo4j.values.storable.Values.{of => _, _} diff --git a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/executionplan/procs/PureSideEffectInternalExecutionResult.scala b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/executionplan/procs/PureSideEffectInternalExecutionResult.scala index 693da80438cba..12b140400f178 100644 --- a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/executionplan/procs/PureSideEffectInternalExecutionResult.scala +++ b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/executionplan/procs/PureSideEffectInternalExecutionResult.scala @@ -26,8 +26,8 @@ import org.neo4j.cypher.internal.compatibility.v3_3.runtime.planDescription.Inte import org.neo4j.cypher.internal.compatibility.v3_3.runtime.{ExecutionMode, ProcedureRuntimeName} import org.neo4j.cypher.internal.spi.v3_3.QueryContext import org.neo4j.cypher.internal.{InternalExecutionResult, QueryStatistics} +import org.neo4j.cypher.result.QueryResult.QueryResultVisitor import org.neo4j.graphdb.Notification -import org.neo4j.values.result.QueryResult.QueryResultVisitor /** * Empty result, as produced by a pure side-effect. diff --git a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/helpers/RuntimeJavaValueConverter.scala b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/helpers/RuntimeJavaValueConverter.scala index 218d5b05e6c37..a4157586d335a 100644 --- a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/helpers/RuntimeJavaValueConverter.scala +++ b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/helpers/RuntimeJavaValueConverter.scala @@ -22,8 +22,8 @@ package org.neo4j.cypher.internal.compatibility.v3_3.runtime.helpers import java.util.{List => JavaList, Map => JavaMap} import org.neo4j.cypher.internal.frontend.v3_3.helpers.Eagerly.immutableMapValues +import org.neo4j.cypher.result.QueryResult.{QueryResultVisitor, Record} import org.neo4j.values.AnyValue -import org.neo4j.values.result.QueryResult.{QueryResultVisitor, Record} import scala.collection.JavaConverters._ import scala.collection.Map diff --git a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/RewindableExecutionResult.scala b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/RewindableExecutionResult.scala index 69035e5a0d673..dff90c31b074b 100644 --- a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/RewindableExecutionResult.scala +++ b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/RewindableExecutionResult.scala @@ -40,9 +40,9 @@ import org.neo4j.cypher.internal.frontend.v3_2.{SemanticDirection => SemanticDir import org.neo4j.cypher.internal.frontend.v3_3.SemanticDirection.{BOTH, INCOMING, OUTGOING} import org.neo4j.cypher.internal.frontend.v3_3.{InputPosition, symbols} import org.neo4j.cypher.internal.javacompat.ExecutionResult +import org.neo4j.cypher.result.QueryResult.QueryResultVisitor import org.neo4j.graphdb.Result.ResultVisitor import org.neo4j.graphdb.{Notification, QueryExecutionType, ResourceIterator, Result} -import org.neo4j.values.result.QueryResult.QueryResultVisitor object RewindableExecutionResult { diff --git a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/helpers/RowIteratorVisitationTest.scala b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/helpers/RowIteratorVisitationTest.scala index 4d78a10f08807..a25af0b34f536 100644 --- a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/helpers/RowIteratorVisitationTest.scala +++ b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/helpers/RowIteratorVisitationTest.scala @@ -21,8 +21,8 @@ package org.neo4j.cypher.internal.compatibility.v3_3.runtime.helpers import org.mockito.Mockito.verifyZeroInteractions import org.neo4j.cypher.internal.frontend.v3_3.test_helpers.CypherFunSuite +import org.neo4j.cypher.result.QueryResult.{QueryResultVisitor, Record} import org.neo4j.values.AnyValue -import org.neo4j.values.result.QueryResult.{QueryResultVisitor, Record} import org.neo4j.values.storable.Values.{intValue, stringValue} import scala.collection.mutable.ArrayBuffer diff --git a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/pipes/QueryStateHelper.scala b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/pipes/QueryStateHelper.scala index f89fdb2aab016..11279ceaa114a 100644 --- a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/pipes/QueryStateHelper.scala +++ b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/pipes/QueryStateHelper.scala @@ -23,12 +23,13 @@ import org.mockito.invocation.InvocationOnMock import org.mockito.stubbing.Answer import org.mockito.{Matchers, Mockito} import org.neo4j.cypher.internal.compatibility.v3_3.runtime.ExecutionContext +import org.neo4j.cypher.internal.javacompat.BaseToObjectValueWriter import org.neo4j.cypher.internal.spi.v3_3.QueryContext import org.neo4j.graphdb.spatial.Point import org.neo4j.graphdb.{Node, Relationship} +import org.neo4j.values.AnyValue import org.neo4j.values.virtual.MapValue import org.neo4j.values.virtual.VirtualValues.EMPTY_MAP -import org.neo4j.values.{AnyValue, BaseToObjectValueWriter} import scala.collection.mutable diff --git a/community/values/src/test/java/org/neo4j/values/storable/BufferValueWriter.java b/community/values/src/test/java/org/neo4j/values/storable/BufferValueWriter.java index e75c1c133aae6..1a40cfc305b36 100644 --- a/community/values/src/test/java/org/neo4j/values/storable/BufferValueWriter.java +++ b/community/values/src/test/java/org/neo4j/values/storable/BufferValueWriter.java @@ -21,12 +21,11 @@ import org.hamcrest.Matchers; +import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.neo4j.string.UTF8; - import static java.lang.String.format; import static org.hamcrest.MatcherAssert.assertThat; import static org.neo4j.values.storable.BufferValueWriter.SpecialKind.BeginArray; @@ -157,7 +156,7 @@ public void writeString( char value ) @Override public void writeUTF8( byte[] bytes, int offset, int length ) throws RuntimeException { - buffer.add( UTF8.decode( bytes, offset, length ) ); + buffer.add( new String( bytes, offset, length, StandardCharsets.UTF_8 ) ); } @Override diff --git a/enterprise/cypher/cypher/src/main/java/org/neo4j/cypher/internal/v3_3/executionplan/GeneratedQueryExecution.java b/enterprise/cypher/cypher/src/main/java/org/neo4j/cypher/internal/v3_3/executionplan/GeneratedQueryExecution.java index 4192173a9c12b..6f3ac4f1713e8 100644 --- a/enterprise/cypher/cypher/src/main/java/org/neo4j/cypher/internal/v3_3/executionplan/GeneratedQueryExecution.java +++ b/enterprise/cypher/cypher/src/main/java/org/neo4j/cypher/internal/v3_3/executionplan/GeneratedQueryExecution.java @@ -22,7 +22,7 @@ import org.neo4j.cypher.internal.compatibility.v3_3.runtime.ExecutionMode; import org.neo4j.cypher.internal.compatibility.v3_3.runtime.executionplan.Completable; import org.neo4j.cypher.internal.compatibility.v3_3.runtime.planDescription.InternalPlanDescription; -import org.neo4j.values.result.QueryResult; +import org.neo4j.cypher.result.QueryResult; public interface GeneratedQueryExecution { diff --git a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/CompiledExecutionResult.scala b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/CompiledExecutionResult.scala index 61f26f0693b69..fb22e8475c236 100644 --- a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/CompiledExecutionResult.scala +++ b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/v3_3/runtime/compiled/CompiledExecutionResult.scala @@ -27,8 +27,8 @@ import org.neo4j.cypher.internal.frontend.v3_3.ProfilerStatisticsNotReadyExcepti import org.neo4j.cypher.internal.spi.v3_3.QueryContext import org.neo4j.cypher.internal.v3_3.executionplan.GeneratedQueryExecution import org.neo4j.cypher.internal.{InternalExecutionResult, QueryStatistics} +import org.neo4j.cypher.result.QueryResult.QueryResultVisitor import org.neo4j.graphdb.Notification -import org.neo4j.values.result.QueryResult.QueryResultVisitor /** * Main class for compiled execution results, implements everything in InternalExecutionResult diff --git a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_3/codegen/GeneratedQueryStructure.scala b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_3/codegen/GeneratedQueryStructure.scala index bb012489446dc..70caaa8bf51b4 100644 --- a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_3/codegen/GeneratedQueryStructure.scala +++ b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_3/codegen/GeneratedQueryStructure.scala @@ -42,9 +42,9 @@ import org.neo4j.cypher.internal.javacompat.ResultRecord import org.neo4j.cypher.internal.spi.v3_3.QueryContext import org.neo4j.cypher.internal.v3_3.codegen.QueryExecutionTracer import org.neo4j.cypher.internal.v3_3.executionplan.{GeneratedQuery, GeneratedQueryExecution} +import org.neo4j.cypher.result.QueryResult.QueryResultVisitor import org.neo4j.kernel.api.ReadOperations import org.neo4j.kernel.impl.core.NodeManager -import org.neo4j.values.result.QueryResult.QueryResultVisitor import org.neo4j.values.virtual.MapValue import scala.collection.mutable diff --git a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_3/codegen/Methods.scala b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_3/codegen/Methods.scala index d6cfe32a418ab..18a7b70a45014 100644 --- a/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_3/codegen/Methods.scala +++ b/enterprise/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_3/codegen/Methods.scala @@ -29,6 +29,7 @@ import org.neo4j.cypher.internal.compatibility.v3_3.runtime.planDescription.Id import org.neo4j.cypher.internal.compiler.v3_3.spi.{NodeIdWrapper, RelationshipIdWrapper} import org.neo4j.cypher.internal.javacompat.ResultRecord import org.neo4j.cypher.internal.v3_3.codegen.QueryExecutionTracer +import org.neo4j.cypher.result.QueryResult.{QueryResultVisitor, Record} import org.neo4j.graphdb.Direction import org.neo4j.helpers.collection.MapUtil import org.neo4j.kernel.api.ReadOperations @@ -38,7 +39,6 @@ import org.neo4j.kernel.impl.api.store.RelationshipIterator import org.neo4j.kernel.impl.api.{RelationshipDataExtractor, RelationshipVisitor} import org.neo4j.kernel.impl.core.{NodeManager, NodeProxy, RelationshipProxy} import org.neo4j.values.AnyValue -import org.neo4j.values.result.QueryResult.{QueryResultVisitor, Record} import org.neo4j.values.storable.{Value, Values} object Methods { diff --git a/enterprise/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiled_runtime/v3_3/codegen/CompiledExecutionResultTest.scala b/enterprise/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiled_runtime/v3_3/codegen/CompiledExecutionResultTest.scala index f07576a2ee153..2b969357af149 100644 --- a/enterprise/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiled_runtime/v3_3/codegen/CompiledExecutionResultTest.scala +++ b/enterprise/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiled_runtime/v3_3/codegen/CompiledExecutionResultTest.scala @@ -34,11 +34,11 @@ import org.neo4j.cypher.internal.frontend.v3_3.test_helpers.CypherFunSuite import org.neo4j.cypher.internal.javacompat.{ResultRecord, ValueUtils} import org.neo4j.cypher.internal.spi.v3_3.QueryContext import org.neo4j.cypher.internal.v3_3.executionplan.GeneratedQueryExecution +import org.neo4j.cypher.result.QueryResult.QueryResultVisitor import org.neo4j.graphdb.NotFoundException import org.neo4j.graphdb.Result.{ResultRow, ResultVisitor} import org.neo4j.helpers.collection.Iterators import org.neo4j.values.AnyValue -import org.neo4j.values.result.QueryResult.QueryResultVisitor import org.neo4j.values.storable._ import org.neo4j.values.virtual.{ListValue, MapValue} diff --git a/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/ProcedureInteractionTestBase.java b/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/ProcedureInteractionTestBase.java index eddfe8f919dc0..ef2ab56eeddef 100644 --- a/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/ProcedureInteractionTestBase.java +++ b/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/ProcedureInteractionTestBase.java @@ -43,6 +43,7 @@ import org.neo4j.bolt.v1.transport.integration.TransportTestUtil; import org.neo4j.bolt.v1.transport.socket.client.SocketConnection; import org.neo4j.bolt.v1.transport.socket.client.TransportConnection; +import org.neo4j.cypher.internal.javacompat.BaseToObjectValueWriter; import org.neo4j.graphdb.GraphDatabaseService; import org.neo4j.graphdb.Label; import org.neo4j.graphdb.Node; @@ -72,7 +73,6 @@ import org.neo4j.test.DoubleLatch; import org.neo4j.test.rule.concurrent.ThreadingRule; import org.neo4j.values.AnyValue; -import org.neo4j.values.BaseToObjectValueWriter; import org.neo4j.values.storable.TextValue; import org.neo4j.values.virtual.ListValue; import org.neo4j.values.virtual.MapValue; diff --git a/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/integration/bolt/BoltConnectionManagementIT.java b/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/integration/bolt/BoltConnectionManagementIT.java index f8772d0a3d80a..eb146e176c627 100644 --- a/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/integration/bolt/BoltConnectionManagementIT.java +++ b/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/integration/bolt/BoltConnectionManagementIT.java @@ -41,6 +41,7 @@ import org.neo4j.bolt.v1.transport.socket.client.SocketConnection; import org.neo4j.bolt.v1.transport.socket.client.TransportConnection; import org.neo4j.bolt.v1.transport.socket.client.WebSocketConnection; +import org.neo4j.cypher.result.QueryResult; import org.neo4j.function.Factory; import org.neo4j.graphdb.factory.GraphDatabaseSettings; import org.neo4j.helpers.HostnamePort; @@ -48,7 +49,6 @@ import org.neo4j.test.TestEnterpriseGraphDatabaseFactory; import org.neo4j.test.TestGraphDatabaseFactory; import org.neo4j.test.rule.concurrent.ThreadingRule; -import org.neo4j.values.result.QueryResult; import static java.util.Arrays.asList; import static org.hamcrest.CoreMatchers.allOf;