diff --git a/neo4j-bolt-connection-bom/pom.xml b/neo4j-bolt-connection-bom/pom.xml
index 949047d1..10bd4d8a 100644
--- a/neo4j-bolt-connection-bom/pom.xml
+++ b/neo4j-bolt-connection-bom/pom.xml
@@ -30,6 +30,11 @@
neo4j-bolt-connection-netty
${project.version}
+
+ org.neo4j.bolt
+ neo4j-bolt-connection-packstream
+ ${project.version}
+
org.neo4j.bolt
neo4j-bolt-connection-pooled
diff --git a/neo4j-bolt-connection-netty/LICENSES.txt b/neo4j-bolt-connection-netty/LICENSES.txt
index 8d9d6d6d..63d251ba 100644
--- a/neo4j-bolt-connection-netty/LICENSES.txt
+++ b/neo4j-bolt-connection-netty/LICENSES.txt
@@ -5,6 +5,7 @@ libraries. For an overview of the licenses see the NOTICE.txt file.
------------------------------------------------------------------------------
Apache Software License, Version 2.0
Neo4j Bolt Connection (Provider SPI)
+ Neo4j Bolt Connection PackStream
Netty/Buffer
Netty/Codec/Base
Netty/Common
diff --git a/neo4j-bolt-connection-netty/NOTICE.txt b/neo4j-bolt-connection-netty/NOTICE.txt
index ae1f89bb..b29bfcb7 100644
--- a/neo4j-bolt-connection-netty/NOTICE.txt
+++ b/neo4j-bolt-connection-netty/NOTICE.txt
@@ -20,6 +20,7 @@ Third-party licenses
Apache Software License, Version 2.0
Neo4j Bolt Connection (Provider SPI)
+ Neo4j Bolt Connection PackStream
Netty/Buffer
Netty/Codec/Base
Netty/Common
diff --git a/neo4j-bolt-connection-netty/pom.xml b/neo4j-bolt-connection-netty/pom.xml
index e6887cc6..73ca50cd 100644
--- a/neo4j-bolt-connection-netty/pom.xml
+++ b/neo4j-bolt-connection-netty/pom.xml
@@ -61,6 +61,10 @@
org.neo4j.bolt
neo4j-bolt-connection
+
+ org.neo4j.bolt
+ neo4j-bolt-connection-packstream
+
org.junit.jupiter
junit-jupiter
diff --git a/neo4j-bolt-connection-netty/src/main/java/module-info.java b/neo4j-bolt-connection-netty/src/main/java/module-info.java
index 41c71e60..c5cadcd6 100644
--- a/neo4j-bolt-connection-netty/src/main/java/module-info.java
+++ b/neo4j-bolt-connection-netty/src/main/java/module-info.java
@@ -25,6 +25,7 @@
exports org.neo4j.bolt.connection.netty;
requires org.neo4j.bolt.connection;
+ requires org.neo4j.bolt.connection.packstream;
requires io.netty.common;
requires io.netty.handler;
requires io.netty.transport;
diff --git a/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/async/inbound/ByteBufInput.java b/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/async/inbound/ByteBufInput.java
index 31b699e4..46fca98f 100644
--- a/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/async/inbound/ByteBufInput.java
+++ b/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/async/inbound/ByteBufInput.java
@@ -19,7 +19,7 @@
import static java.util.Objects.requireNonNull;
import io.netty.buffer.ByteBuf;
-import org.neo4j.bolt.connection.netty.impl.packstream.PackInput;
+import org.neo4j.bolt.connection.packstream.PackInput;
public class ByteBufInput implements PackInput {
private ByteBuf buf;
diff --git a/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/async/outbound/ChunkAwareByteBufOutput.java b/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/async/outbound/ChunkAwareByteBufOutput.java
index 40ee9842..5bac7877 100644
--- a/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/async/outbound/ChunkAwareByteBufOutput.java
+++ b/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/async/outbound/ChunkAwareByteBufOutput.java
@@ -20,7 +20,7 @@
import io.netty.buffer.ByteBuf;
import org.neo4j.bolt.connection.netty.impl.async.connection.BoltProtocolUtil;
-import org.neo4j.bolt.connection.netty.impl.packstream.PackOutput;
+import org.neo4j.bolt.connection.packstream.PackOutput;
public class ChunkAwareByteBufOutput implements PackOutput {
private final int maxChunkSize;
diff --git a/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/AbstractMessageWriter.java b/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/AbstractMessageWriter.java
index 2cd8e687..84e521d7 100644
--- a/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/AbstractMessageWriter.java
+++ b/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/AbstractMessageWriter.java
@@ -20,6 +20,7 @@
import java.io.IOException;
import java.util.Map;
+import org.neo4j.bolt.connection.packstream.value.ValuePacker;
import org.neo4j.bolt.connection.values.ValueFactory;
public abstract class AbstractMessageWriter implements MessageFormat.Writer {
diff --git a/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/MessageEncoder.java b/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/MessageEncoder.java
index 54ee742a..29307f9c 100644
--- a/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/MessageEncoder.java
+++ b/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/MessageEncoder.java
@@ -17,6 +17,7 @@
package org.neo4j.bolt.connection.netty.impl.messaging;
import java.io.IOException;
+import org.neo4j.bolt.connection.packstream.value.ValuePacker;
import org.neo4j.bolt.connection.values.ValueFactory;
public interface MessageEncoder {
diff --git a/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/MessageFormat.java b/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/MessageFormat.java
index 32bd3b82..066e4aae 100644
--- a/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/MessageFormat.java
+++ b/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/MessageFormat.java
@@ -17,8 +17,8 @@
package org.neo4j.bolt.connection.netty.impl.messaging;
import java.io.IOException;
-import org.neo4j.bolt.connection.netty.impl.packstream.PackInput;
-import org.neo4j.bolt.connection.netty.impl.packstream.PackOutput;
+import org.neo4j.bolt.connection.packstream.PackInput;
+import org.neo4j.bolt.connection.packstream.PackOutput;
import org.neo4j.bolt.connection.values.ValueFactory;
public interface MessageFormat {
diff --git a/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/common/CommonMessageReader.java b/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/common/CommonMessageReader.java
index be8457f8..6f1bdea1 100644
--- a/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/common/CommonMessageReader.java
+++ b/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/common/CommonMessageReader.java
@@ -23,12 +23,13 @@
import org.neo4j.bolt.connection.GqlStatusError;
import org.neo4j.bolt.connection.netty.impl.messaging.MessageFormat;
import org.neo4j.bolt.connection.netty.impl.messaging.ResponseMessageHandler;
-import org.neo4j.bolt.connection.netty.impl.messaging.ValueUnpacker;
import org.neo4j.bolt.connection.netty.impl.messaging.response.FailureMessage;
import org.neo4j.bolt.connection.netty.impl.messaging.response.IgnoredMessage;
import org.neo4j.bolt.connection.netty.impl.messaging.response.RecordMessage;
import org.neo4j.bolt.connection.netty.impl.messaging.response.SuccessMessage;
-import org.neo4j.bolt.connection.netty.impl.packstream.PackInput;
+import org.neo4j.bolt.connection.packstream.PackInput;
+import org.neo4j.bolt.connection.packstream.value.CommonValueUnpacker;
+import org.neo4j.bolt.connection.packstream.value.ValueUnpacker;
import org.neo4j.bolt.connection.values.ValueFactory;
public class CommonMessageReader implements MessageFormat.Reader {
diff --git a/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/BeginMessageEncoder.java b/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/BeginMessageEncoder.java
index 2860c329..8ddb4263 100644
--- a/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/BeginMessageEncoder.java
+++ b/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/BeginMessageEncoder.java
@@ -21,8 +21,8 @@
import java.io.IOException;
import org.neo4j.bolt.connection.netty.impl.messaging.Message;
import org.neo4j.bolt.connection.netty.impl.messaging.MessageEncoder;
-import org.neo4j.bolt.connection.netty.impl.messaging.ValuePacker;
import org.neo4j.bolt.connection.netty.impl.messaging.request.BeginMessage;
+import org.neo4j.bolt.connection.packstream.value.ValuePacker;
import org.neo4j.bolt.connection.values.ValueFactory;
public class BeginMessageEncoder implements MessageEncoder {
diff --git a/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/CommitMessageEncoder.java b/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/CommitMessageEncoder.java
index f8cecfa8..8c303359 100644
--- a/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/CommitMessageEncoder.java
+++ b/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/CommitMessageEncoder.java
@@ -21,8 +21,8 @@
import java.io.IOException;
import org.neo4j.bolt.connection.netty.impl.messaging.Message;
import org.neo4j.bolt.connection.netty.impl.messaging.MessageEncoder;
-import org.neo4j.bolt.connection.netty.impl.messaging.ValuePacker;
import org.neo4j.bolt.connection.netty.impl.messaging.request.CommitMessage;
+import org.neo4j.bolt.connection.packstream.value.ValuePacker;
import org.neo4j.bolt.connection.values.ValueFactory;
public class CommitMessageEncoder implements MessageEncoder {
diff --git a/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/DiscardAllMessageEncoder.java b/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/DiscardAllMessageEncoder.java
index d21fe67c..17482630 100644
--- a/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/DiscardAllMessageEncoder.java
+++ b/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/DiscardAllMessageEncoder.java
@@ -21,8 +21,8 @@
import java.io.IOException;
import org.neo4j.bolt.connection.netty.impl.messaging.Message;
import org.neo4j.bolt.connection.netty.impl.messaging.MessageEncoder;
-import org.neo4j.bolt.connection.netty.impl.messaging.ValuePacker;
import org.neo4j.bolt.connection.netty.impl.messaging.request.DiscardAllMessage;
+import org.neo4j.bolt.connection.packstream.value.ValuePacker;
import org.neo4j.bolt.connection.values.ValueFactory;
public class DiscardAllMessageEncoder implements MessageEncoder {
diff --git a/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/DiscardMessageEncoder.java b/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/DiscardMessageEncoder.java
index e0fd8532..0b9774db 100644
--- a/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/DiscardMessageEncoder.java
+++ b/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/DiscardMessageEncoder.java
@@ -21,8 +21,8 @@
import java.io.IOException;
import org.neo4j.bolt.connection.netty.impl.messaging.Message;
import org.neo4j.bolt.connection.netty.impl.messaging.MessageEncoder;
-import org.neo4j.bolt.connection.netty.impl.messaging.ValuePacker;
import org.neo4j.bolt.connection.netty.impl.messaging.request.DiscardMessage;
+import org.neo4j.bolt.connection.packstream.value.ValuePacker;
import org.neo4j.bolt.connection.values.ValueFactory;
public class DiscardMessageEncoder implements MessageEncoder {
diff --git a/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/GoodbyeMessageEncoder.java b/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/GoodbyeMessageEncoder.java
index c58a8a67..eedd7df5 100644
--- a/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/GoodbyeMessageEncoder.java
+++ b/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/GoodbyeMessageEncoder.java
@@ -21,8 +21,8 @@
import java.io.IOException;
import org.neo4j.bolt.connection.netty.impl.messaging.Message;
import org.neo4j.bolt.connection.netty.impl.messaging.MessageEncoder;
-import org.neo4j.bolt.connection.netty.impl.messaging.ValuePacker;
import org.neo4j.bolt.connection.netty.impl.messaging.request.GoodbyeMessage;
+import org.neo4j.bolt.connection.packstream.value.ValuePacker;
import org.neo4j.bolt.connection.values.ValueFactory;
public class GoodbyeMessageEncoder implements MessageEncoder {
diff --git a/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/HelloMessageEncoder.java b/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/HelloMessageEncoder.java
index 645821ca..3097a4b6 100644
--- a/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/HelloMessageEncoder.java
+++ b/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/HelloMessageEncoder.java
@@ -21,8 +21,8 @@
import java.io.IOException;
import org.neo4j.bolt.connection.netty.impl.messaging.Message;
import org.neo4j.bolt.connection.netty.impl.messaging.MessageEncoder;
-import org.neo4j.bolt.connection.netty.impl.messaging.ValuePacker;
import org.neo4j.bolt.connection.netty.impl.messaging.request.HelloMessage;
+import org.neo4j.bolt.connection.packstream.value.ValuePacker;
import org.neo4j.bolt.connection.values.ValueFactory;
public class HelloMessageEncoder implements MessageEncoder {
diff --git a/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/LogoffMessageEncoder.java b/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/LogoffMessageEncoder.java
index a9c838bb..c78578cc 100644
--- a/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/LogoffMessageEncoder.java
+++ b/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/LogoffMessageEncoder.java
@@ -21,8 +21,8 @@
import java.io.IOException;
import org.neo4j.bolt.connection.netty.impl.messaging.Message;
import org.neo4j.bolt.connection.netty.impl.messaging.MessageEncoder;
-import org.neo4j.bolt.connection.netty.impl.messaging.ValuePacker;
import org.neo4j.bolt.connection.netty.impl.messaging.request.LogoffMessage;
+import org.neo4j.bolt.connection.packstream.value.ValuePacker;
import org.neo4j.bolt.connection.values.ValueFactory;
public class LogoffMessageEncoder implements MessageEncoder {
diff --git a/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/LogonMessageEncoder.java b/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/LogonMessageEncoder.java
index 0ed49fe4..e4ba7b2e 100644
--- a/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/LogonMessageEncoder.java
+++ b/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/LogonMessageEncoder.java
@@ -21,8 +21,8 @@
import java.io.IOException;
import org.neo4j.bolt.connection.netty.impl.messaging.Message;
import org.neo4j.bolt.connection.netty.impl.messaging.MessageEncoder;
-import org.neo4j.bolt.connection.netty.impl.messaging.ValuePacker;
import org.neo4j.bolt.connection.netty.impl.messaging.request.LogonMessage;
+import org.neo4j.bolt.connection.packstream.value.ValuePacker;
import org.neo4j.bolt.connection.values.ValueFactory;
public class LogonMessageEncoder implements MessageEncoder {
diff --git a/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/PullAllMessageEncoder.java b/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/PullAllMessageEncoder.java
index 1edda8c7..dd175974 100644
--- a/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/PullAllMessageEncoder.java
+++ b/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/PullAllMessageEncoder.java
@@ -21,8 +21,8 @@
import java.io.IOException;
import org.neo4j.bolt.connection.netty.impl.messaging.Message;
import org.neo4j.bolt.connection.netty.impl.messaging.MessageEncoder;
-import org.neo4j.bolt.connection.netty.impl.messaging.ValuePacker;
import org.neo4j.bolt.connection.netty.impl.messaging.request.PullAllMessage;
+import org.neo4j.bolt.connection.packstream.value.ValuePacker;
import org.neo4j.bolt.connection.values.ValueFactory;
public class PullAllMessageEncoder implements MessageEncoder {
diff --git a/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/PullMessageEncoder.java b/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/PullMessageEncoder.java
index 3f91ff7a..89474d3d 100644
--- a/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/PullMessageEncoder.java
+++ b/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/PullMessageEncoder.java
@@ -21,8 +21,8 @@
import java.io.IOException;
import org.neo4j.bolt.connection.netty.impl.messaging.Message;
import org.neo4j.bolt.connection.netty.impl.messaging.MessageEncoder;
-import org.neo4j.bolt.connection.netty.impl.messaging.ValuePacker;
import org.neo4j.bolt.connection.netty.impl.messaging.request.PullMessage;
+import org.neo4j.bolt.connection.packstream.value.ValuePacker;
import org.neo4j.bolt.connection.values.ValueFactory;
public class PullMessageEncoder implements MessageEncoder {
diff --git a/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/ResetMessageEncoder.java b/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/ResetMessageEncoder.java
index 7a6785d2..1c8341d0 100644
--- a/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/ResetMessageEncoder.java
+++ b/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/ResetMessageEncoder.java
@@ -21,8 +21,8 @@
import java.io.IOException;
import org.neo4j.bolt.connection.netty.impl.messaging.Message;
import org.neo4j.bolt.connection.netty.impl.messaging.MessageEncoder;
-import org.neo4j.bolt.connection.netty.impl.messaging.ValuePacker;
import org.neo4j.bolt.connection.netty.impl.messaging.request.ResetMessage;
+import org.neo4j.bolt.connection.packstream.value.ValuePacker;
import org.neo4j.bolt.connection.values.ValueFactory;
public class ResetMessageEncoder implements MessageEncoder {
diff --git a/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/RollbackMessageEncoder.java b/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/RollbackMessageEncoder.java
index ce8e2a18..303fcdeb 100644
--- a/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/RollbackMessageEncoder.java
+++ b/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/RollbackMessageEncoder.java
@@ -21,8 +21,8 @@
import java.io.IOException;
import org.neo4j.bolt.connection.netty.impl.messaging.Message;
import org.neo4j.bolt.connection.netty.impl.messaging.MessageEncoder;
-import org.neo4j.bolt.connection.netty.impl.messaging.ValuePacker;
import org.neo4j.bolt.connection.netty.impl.messaging.request.RollbackMessage;
+import org.neo4j.bolt.connection.packstream.value.ValuePacker;
import org.neo4j.bolt.connection.values.ValueFactory;
public class RollbackMessageEncoder implements MessageEncoder {
diff --git a/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/RouteMessageEncoder.java b/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/RouteMessageEncoder.java
index f1c7ea45..1ef1d00b 100644
--- a/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/RouteMessageEncoder.java
+++ b/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/RouteMessageEncoder.java
@@ -21,8 +21,8 @@
import java.io.IOException;
import org.neo4j.bolt.connection.netty.impl.messaging.Message;
import org.neo4j.bolt.connection.netty.impl.messaging.MessageEncoder;
-import org.neo4j.bolt.connection.netty.impl.messaging.ValuePacker;
import org.neo4j.bolt.connection.netty.impl.messaging.request.RouteMessage;
+import org.neo4j.bolt.connection.packstream.value.ValuePacker;
import org.neo4j.bolt.connection.values.ValueFactory;
/**
diff --git a/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/RouteV44MessageEncoder.java b/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/RouteV44MessageEncoder.java
index 91a34a8e..0d5bac5e 100644
--- a/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/RouteV44MessageEncoder.java
+++ b/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/RouteV44MessageEncoder.java
@@ -23,8 +23,8 @@
import java.util.Map;
import org.neo4j.bolt.connection.netty.impl.messaging.Message;
import org.neo4j.bolt.connection.netty.impl.messaging.MessageEncoder;
-import org.neo4j.bolt.connection.netty.impl.messaging.ValuePacker;
import org.neo4j.bolt.connection.netty.impl.messaging.request.RouteMessage;
+import org.neo4j.bolt.connection.packstream.value.ValuePacker;
import org.neo4j.bolt.connection.values.Value;
import org.neo4j.bolt.connection.values.ValueFactory;
diff --git a/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/RunWithMetadataMessageEncoder.java b/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/RunWithMetadataMessageEncoder.java
index 77bd266b..3b526c1c 100644
--- a/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/RunWithMetadataMessageEncoder.java
+++ b/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/RunWithMetadataMessageEncoder.java
@@ -21,8 +21,8 @@
import java.io.IOException;
import org.neo4j.bolt.connection.netty.impl.messaging.Message;
import org.neo4j.bolt.connection.netty.impl.messaging.MessageEncoder;
-import org.neo4j.bolt.connection.netty.impl.messaging.ValuePacker;
import org.neo4j.bolt.connection.netty.impl.messaging.request.RunWithMetadataMessage;
+import org.neo4j.bolt.connection.packstream.value.ValuePacker;
import org.neo4j.bolt.connection.values.ValueFactory;
public class RunWithMetadataMessageEncoder implements MessageEncoder {
diff --git a/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/TelemetryMessageEncoder.java b/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/TelemetryMessageEncoder.java
index 7284c029..d2418829 100644
--- a/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/TelemetryMessageEncoder.java
+++ b/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/TelemetryMessageEncoder.java
@@ -21,8 +21,8 @@
import java.io.IOException;
import org.neo4j.bolt.connection.netty.impl.messaging.Message;
import org.neo4j.bolt.connection.netty.impl.messaging.MessageEncoder;
-import org.neo4j.bolt.connection.netty.impl.messaging.ValuePacker;
import org.neo4j.bolt.connection.netty.impl.messaging.request.TelemetryMessage;
+import org.neo4j.bolt.connection.packstream.value.ValuePacker;
import org.neo4j.bolt.connection.values.ValueFactory;
public class TelemetryMessageEncoder implements MessageEncoder {
diff --git a/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/v3/MessageFormatV3.java b/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/v3/MessageFormatV3.java
index 65cf2aa0..eb7f31d5 100644
--- a/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/v3/MessageFormatV3.java
+++ b/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/v3/MessageFormatV3.java
@@ -18,8 +18,8 @@
import org.neo4j.bolt.connection.netty.impl.messaging.MessageFormat;
import org.neo4j.bolt.connection.netty.impl.messaging.common.CommonMessageReader;
-import org.neo4j.bolt.connection.netty.impl.packstream.PackInput;
-import org.neo4j.bolt.connection.netty.impl.packstream.PackOutput;
+import org.neo4j.bolt.connection.packstream.PackInput;
+import org.neo4j.bolt.connection.packstream.PackOutput;
import org.neo4j.bolt.connection.values.ValueFactory;
public class MessageFormatV3 implements MessageFormat {
diff --git a/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/v3/MessageWriterV3.java b/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/v3/MessageWriterV3.java
index cd039eae..3da603d7 100644
--- a/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/v3/MessageWriterV3.java
+++ b/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/v3/MessageWriterV3.java
@@ -19,7 +19,6 @@
import java.util.Map;
import org.neo4j.bolt.connection.netty.impl.messaging.AbstractMessageWriter;
import org.neo4j.bolt.connection.netty.impl.messaging.MessageEncoder;
-import org.neo4j.bolt.connection.netty.impl.messaging.common.CommonValuePacker;
import org.neo4j.bolt.connection.netty.impl.messaging.encode.BeginMessageEncoder;
import org.neo4j.bolt.connection.netty.impl.messaging.encode.CommitMessageEncoder;
import org.neo4j.bolt.connection.netty.impl.messaging.encode.DiscardAllMessageEncoder;
@@ -38,7 +37,8 @@
import org.neo4j.bolt.connection.netty.impl.messaging.request.ResetMessage;
import org.neo4j.bolt.connection.netty.impl.messaging.request.RollbackMessage;
import org.neo4j.bolt.connection.netty.impl.messaging.request.RunWithMetadataMessage;
-import org.neo4j.bolt.connection.netty.impl.packstream.PackOutput;
+import org.neo4j.bolt.connection.packstream.PackOutput;
+import org.neo4j.bolt.connection.packstream.value.CommonValuePacker;
import org.neo4j.bolt.connection.values.ValueFactory;
public class MessageWriterV3 extends AbstractMessageWriter {
diff --git a/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/v4/MessageFormatV4.java b/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/v4/MessageFormatV4.java
index 3bf8d0c8..e2d95ab0 100644
--- a/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/v4/MessageFormatV4.java
+++ b/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/v4/MessageFormatV4.java
@@ -18,8 +18,8 @@
import org.neo4j.bolt.connection.netty.impl.messaging.MessageFormat;
import org.neo4j.bolt.connection.netty.impl.messaging.common.CommonMessageReader;
-import org.neo4j.bolt.connection.netty.impl.packstream.PackInput;
-import org.neo4j.bolt.connection.netty.impl.packstream.PackOutput;
+import org.neo4j.bolt.connection.packstream.PackInput;
+import org.neo4j.bolt.connection.packstream.PackOutput;
import org.neo4j.bolt.connection.values.ValueFactory;
public class MessageFormatV4 implements MessageFormat {
diff --git a/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/v4/MessageWriterV4.java b/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/v4/MessageWriterV4.java
index 526dea05..582ff2b1 100644
--- a/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/v4/MessageWriterV4.java
+++ b/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/v4/MessageWriterV4.java
@@ -19,7 +19,6 @@
import java.util.Map;
import org.neo4j.bolt.connection.netty.impl.messaging.AbstractMessageWriter;
import org.neo4j.bolt.connection.netty.impl.messaging.MessageEncoder;
-import org.neo4j.bolt.connection.netty.impl.messaging.common.CommonValuePacker;
import org.neo4j.bolt.connection.netty.impl.messaging.encode.BeginMessageEncoder;
import org.neo4j.bolt.connection.netty.impl.messaging.encode.CommitMessageEncoder;
import org.neo4j.bolt.connection.netty.impl.messaging.encode.DiscardMessageEncoder;
@@ -38,7 +37,8 @@
import org.neo4j.bolt.connection.netty.impl.messaging.request.ResetMessage;
import org.neo4j.bolt.connection.netty.impl.messaging.request.RollbackMessage;
import org.neo4j.bolt.connection.netty.impl.messaging.request.RunWithMetadataMessage;
-import org.neo4j.bolt.connection.netty.impl.packstream.PackOutput;
+import org.neo4j.bolt.connection.packstream.PackOutput;
+import org.neo4j.bolt.connection.packstream.value.CommonValuePacker;
import org.neo4j.bolt.connection.values.ValueFactory;
public class MessageWriterV4 extends AbstractMessageWriter {
diff --git a/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/v43/MessageFormatV43.java b/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/v43/MessageFormatV43.java
index 9f85c806..7ef96b86 100644
--- a/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/v43/MessageFormatV43.java
+++ b/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/v43/MessageFormatV43.java
@@ -18,8 +18,8 @@
import org.neo4j.bolt.connection.netty.impl.messaging.MessageFormat;
import org.neo4j.bolt.connection.netty.impl.messaging.common.CommonMessageReader;
-import org.neo4j.bolt.connection.netty.impl.packstream.PackInput;
-import org.neo4j.bolt.connection.netty.impl.packstream.PackOutput;
+import org.neo4j.bolt.connection.packstream.PackInput;
+import org.neo4j.bolt.connection.packstream.PackOutput;
import org.neo4j.bolt.connection.values.ValueFactory;
/**
diff --git a/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/v43/MessageWriterV43.java b/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/v43/MessageWriterV43.java
index 49a1db1d..e313064e 100644
--- a/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/v43/MessageWriterV43.java
+++ b/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/v43/MessageWriterV43.java
@@ -19,7 +19,6 @@
import java.util.Map;
import org.neo4j.bolt.connection.netty.impl.messaging.AbstractMessageWriter;
import org.neo4j.bolt.connection.netty.impl.messaging.MessageEncoder;
-import org.neo4j.bolt.connection.netty.impl.messaging.common.CommonValuePacker;
import org.neo4j.bolt.connection.netty.impl.messaging.encode.BeginMessageEncoder;
import org.neo4j.bolt.connection.netty.impl.messaging.encode.CommitMessageEncoder;
import org.neo4j.bolt.connection.netty.impl.messaging.encode.DiscardMessageEncoder;
@@ -40,7 +39,8 @@
import org.neo4j.bolt.connection.netty.impl.messaging.request.RollbackMessage;
import org.neo4j.bolt.connection.netty.impl.messaging.request.RouteMessage;
import org.neo4j.bolt.connection.netty.impl.messaging.request.RunWithMetadataMessage;
-import org.neo4j.bolt.connection.netty.impl.packstream.PackOutput;
+import org.neo4j.bolt.connection.packstream.PackOutput;
+import org.neo4j.bolt.connection.packstream.value.CommonValuePacker;
import org.neo4j.bolt.connection.values.ValueFactory;
/**
diff --git a/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/v44/MessageFormatV44.java b/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/v44/MessageFormatV44.java
index 61728ff0..10843442 100644
--- a/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/v44/MessageFormatV44.java
+++ b/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/v44/MessageFormatV44.java
@@ -18,8 +18,8 @@
import org.neo4j.bolt.connection.netty.impl.messaging.MessageFormat;
import org.neo4j.bolt.connection.netty.impl.messaging.common.CommonMessageReader;
-import org.neo4j.bolt.connection.netty.impl.packstream.PackInput;
-import org.neo4j.bolt.connection.netty.impl.packstream.PackOutput;
+import org.neo4j.bolt.connection.packstream.PackInput;
+import org.neo4j.bolt.connection.packstream.PackOutput;
import org.neo4j.bolt.connection.values.ValueFactory;
/**
diff --git a/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/v44/MessageWriterV44.java b/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/v44/MessageWriterV44.java
index 0504edfe..26ff876f 100644
--- a/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/v44/MessageWriterV44.java
+++ b/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/v44/MessageWriterV44.java
@@ -19,7 +19,6 @@
import java.util.Map;
import org.neo4j.bolt.connection.netty.impl.messaging.AbstractMessageWriter;
import org.neo4j.bolt.connection.netty.impl.messaging.MessageEncoder;
-import org.neo4j.bolt.connection.netty.impl.messaging.common.CommonValuePacker;
import org.neo4j.bolt.connection.netty.impl.messaging.encode.BeginMessageEncoder;
import org.neo4j.bolt.connection.netty.impl.messaging.encode.CommitMessageEncoder;
import org.neo4j.bolt.connection.netty.impl.messaging.encode.DiscardMessageEncoder;
@@ -40,7 +39,8 @@
import org.neo4j.bolt.connection.netty.impl.messaging.request.RollbackMessage;
import org.neo4j.bolt.connection.netty.impl.messaging.request.RouteMessage;
import org.neo4j.bolt.connection.netty.impl.messaging.request.RunWithMetadataMessage;
-import org.neo4j.bolt.connection.netty.impl.packstream.PackOutput;
+import org.neo4j.bolt.connection.packstream.PackOutput;
+import org.neo4j.bolt.connection.packstream.value.CommonValuePacker;
import org.neo4j.bolt.connection.values.ValueFactory;
/**
diff --git a/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/v5/MessageFormatV5.java b/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/v5/MessageFormatV5.java
index 75413ae6..65d620eb 100644
--- a/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/v5/MessageFormatV5.java
+++ b/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/v5/MessageFormatV5.java
@@ -17,8 +17,8 @@
package org.neo4j.bolt.connection.netty.impl.messaging.v5;
import org.neo4j.bolt.connection.netty.impl.messaging.MessageFormat;
-import org.neo4j.bolt.connection.netty.impl.packstream.PackInput;
-import org.neo4j.bolt.connection.netty.impl.packstream.PackOutput;
+import org.neo4j.bolt.connection.packstream.PackInput;
+import org.neo4j.bolt.connection.packstream.PackOutput;
import org.neo4j.bolt.connection.values.ValueFactory;
public class MessageFormatV5 implements MessageFormat {
diff --git a/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/v5/MessageReaderV5.java b/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/v5/MessageReaderV5.java
index 523f715e..8df08a28 100644
--- a/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/v5/MessageReaderV5.java
+++ b/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/v5/MessageReaderV5.java
@@ -16,9 +16,10 @@
*/
package org.neo4j.bolt.connection.netty.impl.messaging.v5;
-import org.neo4j.bolt.connection.netty.impl.messaging.ValueUnpacker;
import org.neo4j.bolt.connection.netty.impl.messaging.common.CommonMessageReader;
-import org.neo4j.bolt.connection.netty.impl.packstream.PackInput;
+import org.neo4j.bolt.connection.packstream.PackInput;
+import org.neo4j.bolt.connection.packstream.value.ValueUnpacker;
+import org.neo4j.bolt.connection.packstream.value.ValueUnpackerV5;
import org.neo4j.bolt.connection.values.ValueFactory;
public class MessageReaderV5 extends CommonMessageReader {
diff --git a/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/v5/MessageWriterV5.java b/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/v5/MessageWriterV5.java
index f233b297..2fa5c011 100644
--- a/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/v5/MessageWriterV5.java
+++ b/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/v5/MessageWriterV5.java
@@ -19,7 +19,6 @@
import java.util.Map;
import org.neo4j.bolt.connection.netty.impl.messaging.AbstractMessageWriter;
import org.neo4j.bolt.connection.netty.impl.messaging.MessageEncoder;
-import org.neo4j.bolt.connection.netty.impl.messaging.common.CommonValuePacker;
import org.neo4j.bolt.connection.netty.impl.messaging.encode.BeginMessageEncoder;
import org.neo4j.bolt.connection.netty.impl.messaging.encode.CommitMessageEncoder;
import org.neo4j.bolt.connection.netty.impl.messaging.encode.DiscardMessageEncoder;
@@ -40,7 +39,8 @@
import org.neo4j.bolt.connection.netty.impl.messaging.request.RollbackMessage;
import org.neo4j.bolt.connection.netty.impl.messaging.request.RouteMessage;
import org.neo4j.bolt.connection.netty.impl.messaging.request.RunWithMetadataMessage;
-import org.neo4j.bolt.connection.netty.impl.packstream.PackOutput;
+import org.neo4j.bolt.connection.packstream.PackOutput;
+import org.neo4j.bolt.connection.packstream.value.CommonValuePacker;
import org.neo4j.bolt.connection.values.ValueFactory;
public class MessageWriterV5 extends AbstractMessageWriter {
diff --git a/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/v51/MessageFormatV51.java b/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/v51/MessageFormatV51.java
index 445ca758..0ab7ff5c 100644
--- a/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/v51/MessageFormatV51.java
+++ b/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/v51/MessageFormatV51.java
@@ -18,8 +18,8 @@
import org.neo4j.bolt.connection.netty.impl.messaging.MessageFormat;
import org.neo4j.bolt.connection.netty.impl.messaging.v5.MessageReaderV5;
-import org.neo4j.bolt.connection.netty.impl.packstream.PackInput;
-import org.neo4j.bolt.connection.netty.impl.packstream.PackOutput;
+import org.neo4j.bolt.connection.packstream.PackInput;
+import org.neo4j.bolt.connection.packstream.PackOutput;
import org.neo4j.bolt.connection.values.ValueFactory;
public class MessageFormatV51 implements MessageFormat {
diff --git a/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/v51/MessageWriterV51.java b/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/v51/MessageWriterV51.java
index 3a43fcf7..fb6f787a 100644
--- a/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/v51/MessageWriterV51.java
+++ b/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/v51/MessageWriterV51.java
@@ -19,7 +19,6 @@
import java.util.Map;
import org.neo4j.bolt.connection.netty.impl.messaging.AbstractMessageWriter;
import org.neo4j.bolt.connection.netty.impl.messaging.MessageEncoder;
-import org.neo4j.bolt.connection.netty.impl.messaging.common.CommonValuePacker;
import org.neo4j.bolt.connection.netty.impl.messaging.encode.BeginMessageEncoder;
import org.neo4j.bolt.connection.netty.impl.messaging.encode.CommitMessageEncoder;
import org.neo4j.bolt.connection.netty.impl.messaging.encode.DiscardMessageEncoder;
@@ -44,7 +43,8 @@
import org.neo4j.bolt.connection.netty.impl.messaging.request.RollbackMessage;
import org.neo4j.bolt.connection.netty.impl.messaging.request.RouteMessage;
import org.neo4j.bolt.connection.netty.impl.messaging.request.RunWithMetadataMessage;
-import org.neo4j.bolt.connection.netty.impl.packstream.PackOutput;
+import org.neo4j.bolt.connection.packstream.PackOutput;
+import org.neo4j.bolt.connection.packstream.value.CommonValuePacker;
import org.neo4j.bolt.connection.values.ValueFactory;
public class MessageWriterV51 extends AbstractMessageWriter {
diff --git a/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/v54/MessageFormatV54.java b/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/v54/MessageFormatV54.java
index 3fc5d331..f14e64a8 100644
--- a/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/v54/MessageFormatV54.java
+++ b/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/v54/MessageFormatV54.java
@@ -18,8 +18,8 @@
import org.neo4j.bolt.connection.netty.impl.messaging.MessageFormat;
import org.neo4j.bolt.connection.netty.impl.messaging.v5.MessageReaderV5;
-import org.neo4j.bolt.connection.netty.impl.packstream.PackInput;
-import org.neo4j.bolt.connection.netty.impl.packstream.PackOutput;
+import org.neo4j.bolt.connection.packstream.PackInput;
+import org.neo4j.bolt.connection.packstream.PackOutput;
import org.neo4j.bolt.connection.values.ValueFactory;
public class MessageFormatV54 implements MessageFormat {
diff --git a/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/v54/MessageWriterV54.java b/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/v54/MessageWriterV54.java
index 4d6f3069..59cde4b9 100644
--- a/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/v54/MessageWriterV54.java
+++ b/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/v54/MessageWriterV54.java
@@ -19,7 +19,6 @@
import java.util.Map;
import org.neo4j.bolt.connection.netty.impl.messaging.AbstractMessageWriter;
import org.neo4j.bolt.connection.netty.impl.messaging.MessageEncoder;
-import org.neo4j.bolt.connection.netty.impl.messaging.common.CommonValuePacker;
import org.neo4j.bolt.connection.netty.impl.messaging.encode.BeginMessageEncoder;
import org.neo4j.bolt.connection.netty.impl.messaging.encode.CommitMessageEncoder;
import org.neo4j.bolt.connection.netty.impl.messaging.encode.DiscardMessageEncoder;
@@ -46,7 +45,8 @@
import org.neo4j.bolt.connection.netty.impl.messaging.request.RouteMessage;
import org.neo4j.bolt.connection.netty.impl.messaging.request.RunWithMetadataMessage;
import org.neo4j.bolt.connection.netty.impl.messaging.request.TelemetryMessage;
-import org.neo4j.bolt.connection.netty.impl.packstream.PackOutput;
+import org.neo4j.bolt.connection.packstream.PackOutput;
+import org.neo4j.bolt.connection.packstream.value.CommonValuePacker;
import org.neo4j.bolt.connection.values.ValueFactory;
public class MessageWriterV54 extends AbstractMessageWriter {
diff --git a/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/v57/MessageFormatV57.java b/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/v57/MessageFormatV57.java
index 3ca8d785..f21ad584 100644
--- a/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/v57/MessageFormatV57.java
+++ b/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/v57/MessageFormatV57.java
@@ -18,8 +18,8 @@
import org.neo4j.bolt.connection.netty.impl.messaging.MessageFormat;
import org.neo4j.bolt.connection.netty.impl.messaging.v54.MessageWriterV54;
-import org.neo4j.bolt.connection.netty.impl.packstream.PackInput;
-import org.neo4j.bolt.connection.netty.impl.packstream.PackOutput;
+import org.neo4j.bolt.connection.packstream.PackInput;
+import org.neo4j.bolt.connection.packstream.PackOutput;
import org.neo4j.bolt.connection.values.ValueFactory;
public class MessageFormatV57 implements MessageFormat {
diff --git a/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/v57/MessageReaderV57.java b/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/v57/MessageReaderV57.java
index e3da697e..7d0a46cc 100644
--- a/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/v57/MessageReaderV57.java
+++ b/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/v57/MessageReaderV57.java
@@ -23,9 +23,9 @@
import org.neo4j.bolt.connection.GqlError;
import org.neo4j.bolt.connection.exception.BoltProtocolException;
import org.neo4j.bolt.connection.netty.impl.messaging.ResponseMessageHandler;
-import org.neo4j.bolt.connection.netty.impl.messaging.ValueUnpacker;
import org.neo4j.bolt.connection.netty.impl.messaging.v5.MessageReaderV5;
-import org.neo4j.bolt.connection.netty.impl.packstream.PackInput;
+import org.neo4j.bolt.connection.packstream.PackInput;
+import org.neo4j.bolt.connection.packstream.value.ValueUnpacker;
import org.neo4j.bolt.connection.values.Type;
import org.neo4j.bolt.connection.values.Value;
import org.neo4j.bolt.connection.values.ValueFactory;
diff --git a/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/v6/MessageFormatV6.java b/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/v6/MessageFormatV6.java
index 5981e27e..4157352a 100644
--- a/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/v6/MessageFormatV6.java
+++ b/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/v6/MessageFormatV6.java
@@ -17,8 +17,8 @@
package org.neo4j.bolt.connection.netty.impl.messaging.v6;
import org.neo4j.bolt.connection.netty.impl.messaging.MessageFormat;
-import org.neo4j.bolt.connection.netty.impl.packstream.PackInput;
-import org.neo4j.bolt.connection.netty.impl.packstream.PackOutput;
+import org.neo4j.bolt.connection.packstream.PackInput;
+import org.neo4j.bolt.connection.packstream.PackOutput;
import org.neo4j.bolt.connection.values.ValueFactory;
final class MessageFormatV6 implements MessageFormat {
diff --git a/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/v6/MessageReaderV6.java b/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/v6/MessageReaderV6.java
index f78da16a..8ac26fa3 100644
--- a/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/v6/MessageReaderV6.java
+++ b/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/v6/MessageReaderV6.java
@@ -19,7 +19,8 @@
import java.util.Map;
import org.neo4j.bolt.connection.GqlError;
import org.neo4j.bolt.connection.netty.impl.messaging.v57.MessageReaderV57;
-import org.neo4j.bolt.connection.netty.impl.packstream.PackInput;
+import org.neo4j.bolt.connection.packstream.PackInput;
+import org.neo4j.bolt.connection.packstream.value.ValueUnpackerV6;
import org.neo4j.bolt.connection.values.Value;
import org.neo4j.bolt.connection.values.ValueFactory;
diff --git a/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/v6/MessageWriterV6.java b/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/v6/MessageWriterV6.java
index 8c91a795..83249ccf 100644
--- a/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/v6/MessageWriterV6.java
+++ b/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/v6/MessageWriterV6.java
@@ -45,7 +45,8 @@
import org.neo4j.bolt.connection.netty.impl.messaging.request.RouteMessage;
import org.neo4j.bolt.connection.netty.impl.messaging.request.RunWithMetadataMessage;
import org.neo4j.bolt.connection.netty.impl.messaging.request.TelemetryMessage;
-import org.neo4j.bolt.connection.netty.impl.packstream.PackOutput;
+import org.neo4j.bolt.connection.packstream.PackOutput;
+import org.neo4j.bolt.connection.packstream.value.ValuePackerV6;
import org.neo4j.bolt.connection.values.ValueFactory;
final class MessageWriterV6 extends AbstractMessageWriter {
diff --git a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/async/outbound/OutboundMessageHandlerTest.java b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/async/outbound/OutboundMessageHandlerTest.java
index 685fca6f..878d617d 100644
--- a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/async/outbound/OutboundMessageHandlerTest.java
+++ b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/async/outbound/OutboundMessageHandlerTest.java
@@ -40,7 +40,7 @@
import org.neo4j.bolt.connection.netty.impl.messaging.MessageFormat;
import org.neo4j.bolt.connection.netty.impl.messaging.v3.BoltProtocolV3;
import org.neo4j.bolt.connection.netty.impl.messaging.v3.MessageFormatV3;
-import org.neo4j.bolt.connection.netty.impl.packstream.PackOutput;
+import org.neo4j.bolt.connection.packstream.PackOutput;
import org.neo4j.bolt.connection.test.values.TestValueFactory;
import org.neo4j.bolt.connection.values.Value;
import org.neo4j.bolt.connection.values.ValueFactory;
diff --git a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/MessageFormatTest.java b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/MessageFormatTest.java
index 63ffcbce..a9bd66ff 100644
--- a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/MessageFormatTest.java
+++ b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/MessageFormatTest.java
@@ -38,16 +38,15 @@
import org.neo4j.bolt.connection.netty.impl.async.connection.BoltProtocolUtil;
import org.neo4j.bolt.connection.netty.impl.async.connection.ChannelPipelineBuilderImpl;
import org.neo4j.bolt.connection.netty.impl.async.outbound.ChunkAwareByteBufOutput;
-import org.neo4j.bolt.connection.netty.impl.messaging.common.CommonValueUnpacker;
import org.neo4j.bolt.connection.netty.impl.messaging.response.FailureMessage;
import org.neo4j.bolt.connection.netty.impl.messaging.response.IgnoredMessage;
import org.neo4j.bolt.connection.netty.impl.messaging.response.RecordMessage;
import org.neo4j.bolt.connection.netty.impl.messaging.response.SuccessMessage;
import org.neo4j.bolt.connection.netty.impl.messaging.v3.MessageFormatV3;
-import org.neo4j.bolt.connection.netty.impl.packstream.PackStream;
import org.neo4j.bolt.connection.netty.impl.spi.ResponseHandler;
import org.neo4j.bolt.connection.netty.impl.util.messaging.KnowledgeableMessageFormat;
import org.neo4j.bolt.connection.netty.impl.util.messaging.MemorizingInboundMessageDispatcher;
+import org.neo4j.bolt.connection.packstream.PackStream;
import org.neo4j.bolt.connection.test.values.TestValueFactory;
import org.neo4j.bolt.connection.values.Value;
@@ -94,7 +93,7 @@ void shouldGiveHelpfulErrorOnMalformedNodeStruct() throws Throwable {
packer.packStructHeader(1, RecordMessage.SIGNATURE);
packer.packListHeader(1);
- packer.packStructHeader(0, CommonValueUnpacker.NODE);
+ packer.packStructHeader(0, (byte) 'N');
output.stop();
BoltProtocolUtil.writeMessageBoundary(buf);
diff --git a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/BeginMessageEncoderTest.java b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/BeginMessageEncoderTest.java
index e18ccd3f..792214e0 100644
--- a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/BeginMessageEncoderTest.java
+++ b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/BeginMessageEncoderTest.java
@@ -36,8 +36,8 @@
import org.neo4j.bolt.connection.AccessMode;
import org.neo4j.bolt.connection.DatabaseName;
import org.neo4j.bolt.connection.LoggingProvider;
-import org.neo4j.bolt.connection.netty.impl.messaging.ValuePacker;
import org.neo4j.bolt.connection.netty.impl.messaging.request.BeginMessage;
+import org.neo4j.bolt.connection.packstream.value.ValuePacker;
import org.neo4j.bolt.connection.test.values.TestValueFactory;
import org.neo4j.bolt.connection.values.Value;
import org.neo4j.bolt.connection.values.ValueFactory;
diff --git a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/CommitMessageEncoderTest.java b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/CommitMessageEncoderTest.java
index c74064c0..fde5edbf 100644
--- a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/CommitMessageEncoderTest.java
+++ b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/CommitMessageEncoderTest.java
@@ -23,8 +23,8 @@
import static org.neo4j.bolt.connection.netty.impl.messaging.request.DiscardAllMessage.DISCARD_ALL;
import org.junit.jupiter.api.Test;
-import org.neo4j.bolt.connection.netty.impl.messaging.ValuePacker;
import org.neo4j.bolt.connection.netty.impl.messaging.request.CommitMessage;
+import org.neo4j.bolt.connection.packstream.value.ValuePacker;
import org.neo4j.bolt.connection.values.ValueFactory;
class CommitMessageEncoderTest {
diff --git a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/DiscardAllMessageEncoderTest.java b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/DiscardAllMessageEncoderTest.java
index da444898..1779880e 100644
--- a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/DiscardAllMessageEncoderTest.java
+++ b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/DiscardAllMessageEncoderTest.java
@@ -21,9 +21,9 @@
import static org.mockito.Mockito.verify;
import org.junit.jupiter.api.Test;
-import org.neo4j.bolt.connection.netty.impl.messaging.ValuePacker;
import org.neo4j.bolt.connection.netty.impl.messaging.request.DiscardAllMessage;
import org.neo4j.bolt.connection.netty.impl.messaging.request.DiscardMessage;
+import org.neo4j.bolt.connection.packstream.value.ValuePacker;
import org.neo4j.bolt.connection.values.ValueFactory;
class DiscardAllMessageEncoderTest {
diff --git a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/DiscardMessageEncoderTest.java b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/DiscardMessageEncoderTest.java
index 63f746cf..d4df7025 100644
--- a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/DiscardMessageEncoderTest.java
+++ b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/DiscardMessageEncoderTest.java
@@ -23,9 +23,9 @@
import java.util.HashMap;
import java.util.Map;
import org.junit.jupiter.api.Test;
-import org.neo4j.bolt.connection.netty.impl.messaging.ValuePacker;
import org.neo4j.bolt.connection.netty.impl.messaging.request.DiscardAllMessage;
import org.neo4j.bolt.connection.netty.impl.messaging.request.DiscardMessage;
+import org.neo4j.bolt.connection.packstream.value.ValuePacker;
import org.neo4j.bolt.connection.test.values.TestValueFactory;
import org.neo4j.bolt.connection.values.Value;
import org.neo4j.bolt.connection.values.ValueFactory;
diff --git a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/GoodbyeMessageEncoderTest.java b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/GoodbyeMessageEncoderTest.java
index 0d6927cf..b3cfa3aa 100644
--- a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/GoodbyeMessageEncoderTest.java
+++ b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/GoodbyeMessageEncoderTest.java
@@ -23,8 +23,8 @@
import static org.neo4j.bolt.connection.netty.impl.messaging.request.GoodbyeMessage.GOODBYE;
import org.junit.jupiter.api.Test;
-import org.neo4j.bolt.connection.netty.impl.messaging.ValuePacker;
import org.neo4j.bolt.connection.netty.impl.messaging.request.GoodbyeMessage;
+import org.neo4j.bolt.connection.packstream.value.ValuePacker;
import org.neo4j.bolt.connection.values.ValueFactory;
class GoodbyeMessageEncoderTest {
diff --git a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/HelloMessageEncoderTest.java b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/HelloMessageEncoderTest.java
index 3b06e2b6..de41048a 100644
--- a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/HelloMessageEncoderTest.java
+++ b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/HelloMessageEncoderTest.java
@@ -25,8 +25,8 @@
import java.util.Map;
import org.junit.jupiter.api.Test;
import org.neo4j.bolt.connection.netty.impl.BoltAgentUtil;
-import org.neo4j.bolt.connection.netty.impl.messaging.ValuePacker;
import org.neo4j.bolt.connection.netty.impl.messaging.request.HelloMessage;
+import org.neo4j.bolt.connection.packstream.value.ValuePacker;
import org.neo4j.bolt.connection.test.values.TestValueFactory;
import org.neo4j.bolt.connection.values.Value;
import org.neo4j.bolt.connection.values.ValueFactory;
diff --git a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/PullAllMessageEncoderTest.java b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/PullAllMessageEncoderTest.java
index 51a156ab..fc7c3c4c 100644
--- a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/PullAllMessageEncoderTest.java
+++ b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/PullAllMessageEncoderTest.java
@@ -21,9 +21,9 @@
import static org.mockito.Mockito.verify;
import org.junit.jupiter.api.Test;
-import org.neo4j.bolt.connection.netty.impl.messaging.ValuePacker;
import org.neo4j.bolt.connection.netty.impl.messaging.request.PullAllMessage;
import org.neo4j.bolt.connection.netty.impl.messaging.request.PullMessage;
+import org.neo4j.bolt.connection.packstream.value.ValuePacker;
import org.neo4j.bolt.connection.values.ValueFactory;
class PullAllMessageEncoderTest {
diff --git a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/PullMessageEncoderTest.java b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/PullMessageEncoderTest.java
index 7c4ed2a6..2150a1ab 100644
--- a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/PullMessageEncoderTest.java
+++ b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/PullMessageEncoderTest.java
@@ -23,9 +23,9 @@
import java.util.HashMap;
import java.util.Map;
import org.junit.jupiter.api.Test;
-import org.neo4j.bolt.connection.netty.impl.messaging.ValuePacker;
import org.neo4j.bolt.connection.netty.impl.messaging.request.PullAllMessage;
import org.neo4j.bolt.connection.netty.impl.messaging.request.PullMessage;
+import org.neo4j.bolt.connection.packstream.value.ValuePacker;
import org.neo4j.bolt.connection.test.values.TestValueFactory;
import org.neo4j.bolt.connection.values.Value;
import org.neo4j.bolt.connection.values.ValueFactory;
diff --git a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/ResetMessageEncoderTest.java b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/ResetMessageEncoderTest.java
index 99e0a214..c2ad5c64 100644
--- a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/ResetMessageEncoderTest.java
+++ b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/ResetMessageEncoderTest.java
@@ -22,9 +22,9 @@
import java.util.Collections;
import org.junit.jupiter.api.Test;
-import org.neo4j.bolt.connection.netty.impl.messaging.ValuePacker;
import org.neo4j.bolt.connection.netty.impl.messaging.request.ResetMessage;
import org.neo4j.bolt.connection.netty.impl.messaging.request.RunWithMetadataMessage;
+import org.neo4j.bolt.connection.packstream.value.ValuePacker;
import org.neo4j.bolt.connection.values.ValueFactory;
class ResetMessageEncoderTest {
diff --git a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/RollbackMessageEncoderTest.java b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/RollbackMessageEncoderTest.java
index 10578d03..82f8146f 100644
--- a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/RollbackMessageEncoderTest.java
+++ b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/RollbackMessageEncoderTest.java
@@ -23,8 +23,8 @@
import static org.neo4j.bolt.connection.netty.impl.messaging.request.RollbackMessage.ROLLBACK;
import org.junit.jupiter.api.Test;
-import org.neo4j.bolt.connection.netty.impl.messaging.ValuePacker;
import org.neo4j.bolt.connection.netty.impl.messaging.request.RollbackMessage;
+import org.neo4j.bolt.connection.packstream.value.ValuePacker;
import org.neo4j.bolt.connection.values.ValueFactory;
class RollbackMessageEncoderTest {
diff --git a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/RouteMessageEncoderTest.java b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/RouteMessageEncoderTest.java
index d0d717e5..7ba8a8a4 100644
--- a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/RouteMessageEncoderTest.java
+++ b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/RouteMessageEncoderTest.java
@@ -30,8 +30,8 @@
import org.junit.jupiter.params.provider.NullSource;
import org.junit.jupiter.params.provider.ValueSource;
import org.neo4j.bolt.connection.netty.impl.messaging.Message;
-import org.neo4j.bolt.connection.netty.impl.messaging.ValuePacker;
import org.neo4j.bolt.connection.netty.impl.messaging.request.RouteMessage;
+import org.neo4j.bolt.connection.packstream.value.ValuePacker;
import org.neo4j.bolt.connection.test.values.TestValueFactory;
import org.neo4j.bolt.connection.values.Value;
import org.neo4j.bolt.connection.values.ValueFactory;
diff --git a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/RunWithMetadataMessageEncoderTest.java b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/RunWithMetadataMessageEncoderTest.java
index a869a320..35f156e4 100644
--- a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/RunWithMetadataMessageEncoderTest.java
+++ b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/RunWithMetadataMessageEncoderTest.java
@@ -36,8 +36,8 @@
import org.junit.jupiter.params.provider.EnumSource;
import org.neo4j.bolt.connection.AccessMode;
import org.neo4j.bolt.connection.LoggingProvider;
-import org.neo4j.bolt.connection.netty.impl.messaging.ValuePacker;
import org.neo4j.bolt.connection.netty.impl.messaging.request.RunWithMetadataMessage;
+import org.neo4j.bolt.connection.packstream.value.ValuePacker;
import org.neo4j.bolt.connection.test.values.TestValueFactory;
import org.neo4j.bolt.connection.values.Value;
import org.neo4j.bolt.connection.values.ValueFactory;
diff --git a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/TelemetryMessageEncoderTest.java b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/TelemetryMessageEncoderTest.java
index 1f979fdd..1f59d3e3 100644
--- a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/TelemetryMessageEncoderTest.java
+++ b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/encode/TelemetryMessageEncoderTest.java
@@ -26,9 +26,9 @@
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.MethodSource;
import org.neo4j.bolt.connection.TelemetryApi;
-import org.neo4j.bolt.connection.netty.impl.messaging.ValuePacker;
import org.neo4j.bolt.connection.netty.impl.messaging.request.RunWithMetadataMessage;
import org.neo4j.bolt.connection.netty.impl.messaging.request.TelemetryMessage;
+import org.neo4j.bolt.connection.packstream.value.ValuePacker;
import org.neo4j.bolt.connection.test.values.TestValueFactory;
import org.neo4j.bolt.connection.values.ValueFactory;
diff --git a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v3/MessageFormatV3Test.java b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v3/MessageFormatV3Test.java
index 173301d0..365477d0 100644
--- a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v3/MessageFormatV3Test.java
+++ b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v3/MessageFormatV3Test.java
@@ -22,8 +22,8 @@
import org.junit.jupiter.api.Test;
import org.neo4j.bolt.connection.netty.impl.messaging.MessageFormat;
import org.neo4j.bolt.connection.netty.impl.messaging.common.CommonMessageReader;
-import org.neo4j.bolt.connection.netty.impl.packstream.PackInput;
-import org.neo4j.bolt.connection.netty.impl.packstream.PackOutput;
+import org.neo4j.bolt.connection.packstream.PackInput;
+import org.neo4j.bolt.connection.packstream.PackOutput;
import org.neo4j.bolt.connection.values.ValueFactory;
/**
diff --git a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v3/MessageReaderV3Test.java b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v3/MessageReaderV3Test.java
index 1836265f..e6a37141 100644
--- a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v3/MessageReaderV3Test.java
+++ b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v3/MessageReaderV3Test.java
@@ -37,8 +37,8 @@
import org.neo4j.bolt.connection.netty.impl.messaging.response.IgnoredMessage;
import org.neo4j.bolt.connection.netty.impl.messaging.response.RecordMessage;
import org.neo4j.bolt.connection.netty.impl.messaging.response.SuccessMessage;
-import org.neo4j.bolt.connection.netty.impl.packstream.PackInput;
import org.neo4j.bolt.connection.netty.impl.util.messaging.AbstractMessageReaderTestBase;
+import org.neo4j.bolt.connection.packstream.PackInput;
import org.neo4j.bolt.connection.values.Value;
/**
diff --git a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v3/MessageWriterV3Test.java b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v3/MessageWriterV3Test.java
index fe4cb5be..d53dfb4a 100644
--- a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v3/MessageWriterV3Test.java
+++ b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v3/MessageWriterV3Test.java
@@ -48,8 +48,8 @@
import org.neo4j.bolt.connection.netty.impl.messaging.MessageFormat;
import org.neo4j.bolt.connection.netty.impl.messaging.request.BeginMessage;
import org.neo4j.bolt.connection.netty.impl.messaging.request.HelloMessage;
-import org.neo4j.bolt.connection.netty.impl.packstream.PackOutput;
import org.neo4j.bolt.connection.netty.impl.util.messaging.AbstractMessageWriterTestBase;
+import org.neo4j.bolt.connection.packstream.PackOutput;
/**
* The MessageWriter under tests is the one provided by the {@link BoltProtocolV3} and not an specific class
diff --git a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v4/MessageFormatV4Test.java b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v4/MessageFormatV4Test.java
index 8fcff52c..c519b7f5 100644
--- a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v4/MessageFormatV4Test.java
+++ b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v4/MessageFormatV4Test.java
@@ -22,8 +22,8 @@
import org.junit.jupiter.api.Test;
import org.neo4j.bolt.connection.netty.impl.messaging.MessageFormat;
import org.neo4j.bolt.connection.netty.impl.messaging.common.CommonMessageReader;
-import org.neo4j.bolt.connection.netty.impl.packstream.PackInput;
-import org.neo4j.bolt.connection.netty.impl.packstream.PackOutput;
+import org.neo4j.bolt.connection.packstream.PackInput;
+import org.neo4j.bolt.connection.packstream.PackOutput;
import org.neo4j.bolt.connection.values.ValueFactory;
/**
diff --git a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v4/MessageReaderV4Test.java b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v4/MessageReaderV4Test.java
index be0bc79f..98d12aae 100644
--- a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v4/MessageReaderV4Test.java
+++ b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v4/MessageReaderV4Test.java
@@ -37,8 +37,8 @@
import org.neo4j.bolt.connection.netty.impl.messaging.response.IgnoredMessage;
import org.neo4j.bolt.connection.netty.impl.messaging.response.RecordMessage;
import org.neo4j.bolt.connection.netty.impl.messaging.response.SuccessMessage;
-import org.neo4j.bolt.connection.netty.impl.packstream.PackInput;
import org.neo4j.bolt.connection.netty.impl.util.messaging.AbstractMessageReaderTestBase;
+import org.neo4j.bolt.connection.packstream.PackInput;
import org.neo4j.bolt.connection.values.Value;
/**
diff --git a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v4/MessageWriterV4Test.java b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v4/MessageWriterV4Test.java
index c87f48b8..f86e0a83 100644
--- a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v4/MessageWriterV4Test.java
+++ b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v4/MessageWriterV4Test.java
@@ -52,8 +52,8 @@
import org.neo4j.bolt.connection.netty.impl.messaging.request.HelloMessage;
import org.neo4j.bolt.connection.netty.impl.messaging.request.PullMessage;
import org.neo4j.bolt.connection.netty.impl.messaging.v3.BoltProtocolV3;
-import org.neo4j.bolt.connection.netty.impl.packstream.PackOutput;
import org.neo4j.bolt.connection.netty.impl.util.messaging.AbstractMessageWriterTestBase;
+import org.neo4j.bolt.connection.packstream.PackOutput;
/**
* The MessageWriter under tests is the one provided by the {@link BoltProtocolV3} and not an specific class
diff --git a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v41/MessageFormatV41Test.java b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v41/MessageFormatV41Test.java
index 6dd73e31..4eee6012 100644
--- a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v41/MessageFormatV41Test.java
+++ b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v41/MessageFormatV41Test.java
@@ -24,8 +24,8 @@
import org.neo4j.bolt.connection.netty.impl.messaging.common.CommonMessageReader;
import org.neo4j.bolt.connection.netty.impl.messaging.v3.BoltProtocolV3;
import org.neo4j.bolt.connection.netty.impl.messaging.v4.MessageWriterV4;
-import org.neo4j.bolt.connection.netty.impl.packstream.PackInput;
-import org.neo4j.bolt.connection.netty.impl.packstream.PackOutput;
+import org.neo4j.bolt.connection.packstream.PackInput;
+import org.neo4j.bolt.connection.packstream.PackOutput;
import org.neo4j.bolt.connection.values.ValueFactory;
/**
diff --git a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v41/MessageReaderV41Test.java b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v41/MessageReaderV41Test.java
index 423da8a4..8f1506d7 100644
--- a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v41/MessageReaderV41Test.java
+++ b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v41/MessageReaderV41Test.java
@@ -37,8 +37,8 @@
import org.neo4j.bolt.connection.netty.impl.messaging.response.IgnoredMessage;
import org.neo4j.bolt.connection.netty.impl.messaging.response.RecordMessage;
import org.neo4j.bolt.connection.netty.impl.messaging.response.SuccessMessage;
-import org.neo4j.bolt.connection.netty.impl.packstream.PackInput;
import org.neo4j.bolt.connection.netty.impl.util.messaging.AbstractMessageReaderTestBase;
+import org.neo4j.bolt.connection.packstream.PackInput;
import org.neo4j.bolt.connection.values.Value;
/**
diff --git a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v41/MessageWriterV41Test.java b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v41/MessageWriterV41Test.java
index 70c41ee3..6ef25c36 100644
--- a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v41/MessageWriterV41Test.java
+++ b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v41/MessageWriterV41Test.java
@@ -51,8 +51,8 @@
import org.neo4j.bolt.connection.netty.impl.messaging.request.DiscardMessage;
import org.neo4j.bolt.connection.netty.impl.messaging.request.HelloMessage;
import org.neo4j.bolt.connection.netty.impl.messaging.request.PullMessage;
-import org.neo4j.bolt.connection.netty.impl.packstream.PackOutput;
import org.neo4j.bolt.connection.netty.impl.util.messaging.AbstractMessageWriterTestBase;
+import org.neo4j.bolt.connection.packstream.PackOutput;
/**
* The MessageWriter under tests is the one provided by the {@link BoltProtocolV41} and not an specific class
diff --git a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v42/MessageFormatV42Test.java b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v42/MessageFormatV42Test.java
index 90f8af28..d2d1670c 100644
--- a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v42/MessageFormatV42Test.java
+++ b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v42/MessageFormatV42Test.java
@@ -23,8 +23,8 @@
import org.neo4j.bolt.connection.netty.impl.messaging.MessageFormat;
import org.neo4j.bolt.connection.netty.impl.messaging.common.CommonMessageReader;
import org.neo4j.bolt.connection.netty.impl.messaging.v4.MessageWriterV4;
-import org.neo4j.bolt.connection.netty.impl.packstream.PackInput;
-import org.neo4j.bolt.connection.netty.impl.packstream.PackOutput;
+import org.neo4j.bolt.connection.packstream.PackInput;
+import org.neo4j.bolt.connection.packstream.PackOutput;
import org.neo4j.bolt.connection.values.ValueFactory;
/**
diff --git a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v42/MessageReaderV42Test.java b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v42/MessageReaderV42Test.java
index 8c67d02c..ef57ecd5 100644
--- a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v42/MessageReaderV42Test.java
+++ b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v42/MessageReaderV42Test.java
@@ -37,8 +37,8 @@
import org.neo4j.bolt.connection.netty.impl.messaging.response.IgnoredMessage;
import org.neo4j.bolt.connection.netty.impl.messaging.response.RecordMessage;
import org.neo4j.bolt.connection.netty.impl.messaging.response.SuccessMessage;
-import org.neo4j.bolt.connection.netty.impl.packstream.PackInput;
import org.neo4j.bolt.connection.netty.impl.util.messaging.AbstractMessageReaderTestBase;
+import org.neo4j.bolt.connection.packstream.PackInput;
import org.neo4j.bolt.connection.values.Value;
/**
diff --git a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v42/MessageWriterV42Test.java b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v42/MessageWriterV42Test.java
index 90ea8cfe..94ef8b70 100644
--- a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v42/MessageWriterV42Test.java
+++ b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v42/MessageWriterV42Test.java
@@ -51,8 +51,8 @@
import org.neo4j.bolt.connection.netty.impl.messaging.request.DiscardMessage;
import org.neo4j.bolt.connection.netty.impl.messaging.request.HelloMessage;
import org.neo4j.bolt.connection.netty.impl.messaging.request.PullMessage;
-import org.neo4j.bolt.connection.netty.impl.packstream.PackOutput;
import org.neo4j.bolt.connection.netty.impl.util.messaging.AbstractMessageWriterTestBase;
+import org.neo4j.bolt.connection.packstream.PackOutput;
/**
* The MessageWriter under tests is the one provided by the {@link BoltProtocolV42} and not an specific class
diff --git a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v43/MessageFormatV43Test.java b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v43/MessageFormatV43Test.java
index d00c6c26..8b991ae0 100644
--- a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v43/MessageFormatV43Test.java
+++ b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v43/MessageFormatV43Test.java
@@ -22,8 +22,8 @@
import org.junit.jupiter.api.Test;
import org.neo4j.bolt.connection.netty.impl.messaging.MessageFormat;
import org.neo4j.bolt.connection.netty.impl.messaging.common.CommonMessageReader;
-import org.neo4j.bolt.connection.netty.impl.packstream.PackInput;
-import org.neo4j.bolt.connection.netty.impl.packstream.PackOutput;
+import org.neo4j.bolt.connection.packstream.PackInput;
+import org.neo4j.bolt.connection.packstream.PackOutput;
import org.neo4j.bolt.connection.values.ValueFactory;
/**
diff --git a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v43/MessageReaderV43Test.java b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v43/MessageReaderV43Test.java
index 86a1e382..cd7b00bd 100644
--- a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v43/MessageReaderV43Test.java
+++ b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v43/MessageReaderV43Test.java
@@ -38,8 +38,8 @@
import org.neo4j.bolt.connection.netty.impl.messaging.response.RecordMessage;
import org.neo4j.bolt.connection.netty.impl.messaging.response.SuccessMessage;
import org.neo4j.bolt.connection.netty.impl.messaging.v42.BoltProtocolV42;
-import org.neo4j.bolt.connection.netty.impl.packstream.PackInput;
import org.neo4j.bolt.connection.netty.impl.util.messaging.AbstractMessageReaderTestBase;
+import org.neo4j.bolt.connection.packstream.PackInput;
import org.neo4j.bolt.connection.values.Value;
/**
diff --git a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v43/MessageWriterV43Test.java b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v43/MessageWriterV43Test.java
index 02625810..51406e6a 100644
--- a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v43/MessageWriterV43Test.java
+++ b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v43/MessageWriterV43Test.java
@@ -53,8 +53,8 @@
import org.neo4j.bolt.connection.netty.impl.messaging.request.HelloMessage;
import org.neo4j.bolt.connection.netty.impl.messaging.request.PullMessage;
import org.neo4j.bolt.connection.netty.impl.messaging.request.RouteMessage;
-import org.neo4j.bolt.connection.netty.impl.packstream.PackOutput;
import org.neo4j.bolt.connection.netty.impl.util.messaging.AbstractMessageWriterTestBase;
+import org.neo4j.bolt.connection.packstream.PackOutput;
import org.neo4j.bolt.connection.values.Value;
/**
diff --git a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v44/MessageFormatV44Test.java b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v44/MessageFormatV44Test.java
index 5421d7af..112b09aa 100644
--- a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v44/MessageFormatV44Test.java
+++ b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v44/MessageFormatV44Test.java
@@ -22,8 +22,8 @@
import org.junit.jupiter.api.Test;
import org.neo4j.bolt.connection.netty.impl.messaging.MessageFormat;
import org.neo4j.bolt.connection.netty.impl.messaging.common.CommonMessageReader;
-import org.neo4j.bolt.connection.netty.impl.packstream.PackInput;
-import org.neo4j.bolt.connection.netty.impl.packstream.PackOutput;
+import org.neo4j.bolt.connection.packstream.PackInput;
+import org.neo4j.bolt.connection.packstream.PackOutput;
import org.neo4j.bolt.connection.values.ValueFactory;
public class MessageFormatV44Test {
diff --git a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v44/MessageReaderV44Test.java b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v44/MessageReaderV44Test.java
index 551a7a5f..af8efc45 100644
--- a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v44/MessageReaderV44Test.java
+++ b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v44/MessageReaderV44Test.java
@@ -37,8 +37,8 @@
import org.neo4j.bolt.connection.netty.impl.messaging.response.IgnoredMessage;
import org.neo4j.bolt.connection.netty.impl.messaging.response.RecordMessage;
import org.neo4j.bolt.connection.netty.impl.messaging.response.SuccessMessage;
-import org.neo4j.bolt.connection.netty.impl.packstream.PackInput;
import org.neo4j.bolt.connection.netty.impl.util.messaging.AbstractMessageReaderTestBase;
+import org.neo4j.bolt.connection.packstream.PackInput;
import org.neo4j.bolt.connection.values.Value;
/**
diff --git a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v44/MessageWriterV44Test.java b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v44/MessageWriterV44Test.java
index 6177fcf4..d349d122 100644
--- a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v44/MessageWriterV44Test.java
+++ b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v44/MessageWriterV44Test.java
@@ -53,8 +53,8 @@
import org.neo4j.bolt.connection.netty.impl.messaging.request.HelloMessage;
import org.neo4j.bolt.connection.netty.impl.messaging.request.PullMessage;
import org.neo4j.bolt.connection.netty.impl.messaging.request.RouteMessage;
-import org.neo4j.bolt.connection.netty.impl.packstream.PackOutput;
import org.neo4j.bolt.connection.netty.impl.util.messaging.AbstractMessageWriterTestBase;
+import org.neo4j.bolt.connection.packstream.PackOutput;
import org.neo4j.bolt.connection.values.Value;
/**
diff --git a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v5/MessageFormatV5Test.java b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v5/MessageFormatV5Test.java
index b8ac68bf..3fb56b74 100644
--- a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v5/MessageFormatV5Test.java
+++ b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v5/MessageFormatV5Test.java
@@ -21,8 +21,8 @@
import org.junit.jupiter.api.Test;
import org.neo4j.bolt.connection.netty.impl.messaging.MessageFormat;
-import org.neo4j.bolt.connection.netty.impl.packstream.PackInput;
-import org.neo4j.bolt.connection.netty.impl.packstream.PackOutput;
+import org.neo4j.bolt.connection.packstream.PackInput;
+import org.neo4j.bolt.connection.packstream.PackOutput;
import org.neo4j.bolt.connection.values.ValueFactory;
public class MessageFormatV5Test {
diff --git a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v5/MessageReaderV5Test.java b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v5/MessageReaderV5Test.java
index 17804147..0a7c1e7b 100644
--- a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v5/MessageReaderV5Test.java
+++ b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v5/MessageReaderV5Test.java
@@ -37,8 +37,8 @@
import org.neo4j.bolt.connection.netty.impl.messaging.response.IgnoredMessage;
import org.neo4j.bolt.connection.netty.impl.messaging.response.RecordMessage;
import org.neo4j.bolt.connection.netty.impl.messaging.response.SuccessMessage;
-import org.neo4j.bolt.connection.netty.impl.packstream.PackInput;
import org.neo4j.bolt.connection.netty.impl.util.messaging.AbstractMessageReaderTestBase;
+import org.neo4j.bolt.connection.packstream.PackInput;
import org.neo4j.bolt.connection.values.Value;
/**
diff --git a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v5/MessageWriterV5Test.java b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v5/MessageWriterV5Test.java
index 1b458b2d..3ccbb116 100644
--- a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v5/MessageWriterV5Test.java
+++ b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v5/MessageWriterV5Test.java
@@ -53,8 +53,8 @@
import org.neo4j.bolt.connection.netty.impl.messaging.request.HelloMessage;
import org.neo4j.bolt.connection.netty.impl.messaging.request.PullMessage;
import org.neo4j.bolt.connection.netty.impl.messaging.request.RouteMessage;
-import org.neo4j.bolt.connection.netty.impl.packstream.PackOutput;
import org.neo4j.bolt.connection.netty.impl.util.messaging.AbstractMessageWriterTestBase;
+import org.neo4j.bolt.connection.packstream.PackOutput;
import org.neo4j.bolt.connection.values.Value;
/**
diff --git a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v51/MessageFormatV51Test.java b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v51/MessageFormatV51Test.java
index b73ddfb8..edbe4d18 100644
--- a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v51/MessageFormatV51Test.java
+++ b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v51/MessageFormatV51Test.java
@@ -22,8 +22,8 @@
import org.junit.jupiter.api.Test;
import org.neo4j.bolt.connection.netty.impl.messaging.MessageFormat;
import org.neo4j.bolt.connection.netty.impl.messaging.v5.MessageReaderV5;
-import org.neo4j.bolt.connection.netty.impl.packstream.PackInput;
-import org.neo4j.bolt.connection.netty.impl.packstream.PackOutput;
+import org.neo4j.bolt.connection.packstream.PackInput;
+import org.neo4j.bolt.connection.packstream.PackOutput;
import org.neo4j.bolt.connection.values.ValueFactory;
public class MessageFormatV51Test {
diff --git a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v51/MessageWriterV51Test.java b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v51/MessageWriterV51Test.java
index 290d0b17..5ebd1e18 100644
--- a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v51/MessageWriterV51Test.java
+++ b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v51/MessageWriterV51Test.java
@@ -53,8 +53,8 @@
import org.neo4j.bolt.connection.netty.impl.messaging.request.HelloMessage;
import org.neo4j.bolt.connection.netty.impl.messaging.request.PullMessage;
import org.neo4j.bolt.connection.netty.impl.messaging.request.RouteMessage;
-import org.neo4j.bolt.connection.netty.impl.packstream.PackOutput;
import org.neo4j.bolt.connection.netty.impl.util.messaging.AbstractMessageWriterTestBase;
+import org.neo4j.bolt.connection.packstream.PackOutput;
import org.neo4j.bolt.connection.values.Value;
public class MessageWriterV51Test extends AbstractMessageWriterTestBase {
diff --git a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v54/MessageFormatV54Test.java b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v54/MessageFormatV54Test.java
index c21042b2..8023c8d0 100644
--- a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v54/MessageFormatV54Test.java
+++ b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v54/MessageFormatV54Test.java
@@ -22,8 +22,8 @@
import org.junit.jupiter.api.Test;
import org.neo4j.bolt.connection.netty.impl.messaging.MessageFormat;
import org.neo4j.bolt.connection.netty.impl.messaging.v5.MessageReaderV5;
-import org.neo4j.bolt.connection.netty.impl.packstream.PackInput;
-import org.neo4j.bolt.connection.netty.impl.packstream.PackOutput;
+import org.neo4j.bolt.connection.packstream.PackInput;
+import org.neo4j.bolt.connection.packstream.PackOutput;
import org.neo4j.bolt.connection.values.ValueFactory;
class MessageFormatV54Test {
diff --git a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v54/MessageWriterV54Test.java b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v54/MessageWriterV54Test.java
index c137aef0..94280e14 100644
--- a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v54/MessageWriterV54Test.java
+++ b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v54/MessageWriterV54Test.java
@@ -54,8 +54,8 @@
import org.neo4j.bolt.connection.netty.impl.messaging.request.PullMessage;
import org.neo4j.bolt.connection.netty.impl.messaging.request.RouteMessage;
import org.neo4j.bolt.connection.netty.impl.messaging.request.TelemetryMessage;
-import org.neo4j.bolt.connection.netty.impl.packstream.PackOutput;
import org.neo4j.bolt.connection.netty.impl.util.messaging.AbstractMessageWriterTestBase;
+import org.neo4j.bolt.connection.packstream.PackOutput;
import org.neo4j.bolt.connection.values.Value;
public class MessageWriterV54Test extends AbstractMessageWriterTestBase {
diff --git a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v56/MessageFormatV56Test.java b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v56/MessageFormatV56Test.java
index 1816eadd..507e3a3a 100644
--- a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v56/MessageFormatV56Test.java
+++ b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v56/MessageFormatV56Test.java
@@ -23,8 +23,8 @@
import org.neo4j.bolt.connection.netty.impl.messaging.MessageFormat;
import org.neo4j.bolt.connection.netty.impl.messaging.v5.MessageReaderV5;
import org.neo4j.bolt.connection.netty.impl.messaging.v54.MessageWriterV54;
-import org.neo4j.bolt.connection.netty.impl.packstream.PackInput;
-import org.neo4j.bolt.connection.netty.impl.packstream.PackOutput;
+import org.neo4j.bolt.connection.packstream.PackInput;
+import org.neo4j.bolt.connection.packstream.PackOutput;
import org.neo4j.bolt.connection.values.ValueFactory;
class MessageFormatV56Test {
diff --git a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v56/MessageWriterV56Test.java b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v56/MessageWriterV56Test.java
index e2ea7a51..8054d638 100644
--- a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v56/MessageWriterV56Test.java
+++ b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v56/MessageWriterV56Test.java
@@ -54,8 +54,8 @@
import org.neo4j.bolt.connection.netty.impl.messaging.request.PullMessage;
import org.neo4j.bolt.connection.netty.impl.messaging.request.RouteMessage;
import org.neo4j.bolt.connection.netty.impl.messaging.request.TelemetryMessage;
-import org.neo4j.bolt.connection.netty.impl.packstream.PackOutput;
import org.neo4j.bolt.connection.netty.impl.util.messaging.AbstractMessageWriterTestBase;
+import org.neo4j.bolt.connection.packstream.PackOutput;
import org.neo4j.bolt.connection.values.Value;
public class MessageWriterV56Test extends AbstractMessageWriterTestBase {
diff --git a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v57/MessageFormatV57Test.java b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v57/MessageFormatV57Test.java
index 2f7e0620..371aacb0 100644
--- a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v57/MessageFormatV57Test.java
+++ b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v57/MessageFormatV57Test.java
@@ -22,8 +22,8 @@
import org.junit.jupiter.api.Test;
import org.neo4j.bolt.connection.netty.impl.messaging.MessageFormat;
import org.neo4j.bolt.connection.netty.impl.messaging.v54.MessageWriterV54;
-import org.neo4j.bolt.connection.netty.impl.packstream.PackInput;
-import org.neo4j.bolt.connection.netty.impl.packstream.PackOutput;
+import org.neo4j.bolt.connection.packstream.PackInput;
+import org.neo4j.bolt.connection.packstream.PackOutput;
import org.neo4j.bolt.connection.values.ValueFactory;
class MessageFormatV57Test {
diff --git a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v57/MessageReaderV57Test.java b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v57/MessageReaderV57Test.java
index 5b4672bf..7b034ca8 100644
--- a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v57/MessageReaderV57Test.java
+++ b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v57/MessageReaderV57Test.java
@@ -39,8 +39,8 @@
import org.neo4j.bolt.connection.netty.impl.messaging.response.IgnoredMessage;
import org.neo4j.bolt.connection.netty.impl.messaging.response.RecordMessage;
import org.neo4j.bolt.connection.netty.impl.messaging.response.SuccessMessage;
-import org.neo4j.bolt.connection.netty.impl.packstream.PackInput;
import org.neo4j.bolt.connection.netty.impl.util.messaging.AbstractMessageReaderTestBase;
+import org.neo4j.bolt.connection.packstream.PackInput;
import org.neo4j.bolt.connection.values.Value;
class MessageReaderV57Test extends AbstractMessageReaderTestBase {
diff --git a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v57/MessageWriterV57Test.java b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v57/MessageWriterV57Test.java
index 018a9e2e..2e0dfc11 100644
--- a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v57/MessageWriterV57Test.java
+++ b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v57/MessageWriterV57Test.java
@@ -54,8 +54,8 @@
import org.neo4j.bolt.connection.netty.impl.messaging.request.PullMessage;
import org.neo4j.bolt.connection.netty.impl.messaging.request.RouteMessage;
import org.neo4j.bolt.connection.netty.impl.messaging.request.TelemetryMessage;
-import org.neo4j.bolt.connection.netty.impl.packstream.PackOutput;
import org.neo4j.bolt.connection.netty.impl.util.messaging.AbstractMessageWriterTestBase;
+import org.neo4j.bolt.connection.packstream.PackOutput;
import org.neo4j.bolt.connection.values.Value;
public class MessageWriterV57Test extends AbstractMessageWriterTestBase {
diff --git a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v6/MessageFormatV6Test.java b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v6/MessageFormatV6Test.java
index 960ce74d..14a15974 100644
--- a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v6/MessageFormatV6Test.java
+++ b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v6/MessageFormatV6Test.java
@@ -21,8 +21,8 @@
import org.junit.jupiter.api.Test;
import org.neo4j.bolt.connection.netty.impl.messaging.MessageFormat;
-import org.neo4j.bolt.connection.netty.impl.packstream.PackInput;
-import org.neo4j.bolt.connection.netty.impl.packstream.PackOutput;
+import org.neo4j.bolt.connection.packstream.PackInput;
+import org.neo4j.bolt.connection.packstream.PackOutput;
import org.neo4j.bolt.connection.values.ValueFactory;
class MessageFormatV6Test {
diff --git a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v6/MessageReaderV6Test.java b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v6/MessageReaderV6Test.java
index 7223c01f..b5386e1f 100644
--- a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v6/MessageReaderV6Test.java
+++ b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v6/MessageReaderV6Test.java
@@ -39,8 +39,8 @@
import org.neo4j.bolt.connection.netty.impl.messaging.response.IgnoredMessage;
import org.neo4j.bolt.connection.netty.impl.messaging.response.RecordMessage;
import org.neo4j.bolt.connection.netty.impl.messaging.response.SuccessMessage;
-import org.neo4j.bolt.connection.netty.impl.packstream.PackInput;
import org.neo4j.bolt.connection.netty.impl.util.messaging.AbstractMessageReaderTestBase;
+import org.neo4j.bolt.connection.packstream.PackInput;
import org.neo4j.bolt.connection.values.Value;
class MessageReaderV6Test extends AbstractMessageReaderTestBase {
diff --git a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v6/MessageWriterV6Test.java b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v6/MessageWriterV6Test.java
index e329ce21..66c8ef47 100644
--- a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v6/MessageWriterV6Test.java
+++ b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/v6/MessageWriterV6Test.java
@@ -53,8 +53,8 @@
import org.neo4j.bolt.connection.netty.impl.messaging.request.HelloMessage;
import org.neo4j.bolt.connection.netty.impl.messaging.request.PullMessage;
import org.neo4j.bolt.connection.netty.impl.messaging.request.RouteMessage;
-import org.neo4j.bolt.connection.netty.impl.packstream.PackOutput;
import org.neo4j.bolt.connection.netty.impl.util.messaging.AbstractMessageWriterTestBase;
+import org.neo4j.bolt.connection.packstream.PackOutput;
import org.neo4j.bolt.connection.values.Value;
class MessageWriterV6Test extends AbstractMessageWriterTestBase {
diff --git a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/util/io/ByteBufOutput.java b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/util/io/ByteBufOutput.java
index 6bc6de1a..eea07b1f 100644
--- a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/util/io/ByteBufOutput.java
+++ b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/util/io/ByteBufOutput.java
@@ -17,7 +17,7 @@
package org.neo4j.bolt.connection.netty.impl.util.io;
import io.netty.buffer.ByteBuf;
-import org.neo4j.bolt.connection.netty.impl.packstream.PackOutput;
+import org.neo4j.bolt.connection.packstream.PackOutput;
public class ByteBufOutput implements PackOutput {
private final ByteBuf buf;
diff --git a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/util/messaging/AbstractMessageReaderTestBase.java b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/util/messaging/AbstractMessageReaderTestBase.java
index 81864949..fd5df124 100644
--- a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/util/messaging/AbstractMessageReaderTestBase.java
+++ b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/util/messaging/AbstractMessageReaderTestBase.java
@@ -36,8 +36,8 @@
import org.neo4j.bolt.connection.netty.impl.messaging.response.IgnoredMessage;
import org.neo4j.bolt.connection.netty.impl.messaging.response.RecordMessage;
import org.neo4j.bolt.connection.netty.impl.messaging.response.SuccessMessage;
-import org.neo4j.bolt.connection.netty.impl.packstream.PackInput;
import org.neo4j.bolt.connection.netty.impl.util.io.ByteBufOutput;
+import org.neo4j.bolt.connection.packstream.PackInput;
import org.neo4j.bolt.connection.test.values.TestValueFactory;
public abstract class AbstractMessageReaderTestBase {
diff --git a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/util/messaging/AbstractMessageWriterTestBase.java b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/util/messaging/AbstractMessageWriterTestBase.java
index 188c90e5..3e4fe5e5 100644
--- a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/util/messaging/AbstractMessageWriterTestBase.java
+++ b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/util/messaging/AbstractMessageWriterTestBase.java
@@ -30,9 +30,9 @@
import org.neo4j.bolt.connection.netty.impl.async.inbound.ByteBufInput;
import org.neo4j.bolt.connection.netty.impl.messaging.Message;
import org.neo4j.bolt.connection.netty.impl.messaging.MessageFormat;
-import org.neo4j.bolt.connection.netty.impl.packstream.PackOutput;
-import org.neo4j.bolt.connection.netty.impl.packstream.PackStream;
import org.neo4j.bolt.connection.netty.impl.util.io.ByteBufOutput;
+import org.neo4j.bolt.connection.packstream.PackOutput;
+import org.neo4j.bolt.connection.packstream.PackStream;
import org.neo4j.bolt.connection.test.values.TestValueFactory;
import org.neo4j.bolt.connection.values.ValueFactory;
diff --git a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/util/messaging/FailureMessageEncoder.java b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/util/messaging/FailureMessageEncoder.java
index 222fc216..568f640c 100644
--- a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/util/messaging/FailureMessageEncoder.java
+++ b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/util/messaging/FailureMessageEncoder.java
@@ -21,8 +21,8 @@
import java.util.Map;
import org.neo4j.bolt.connection.netty.impl.messaging.Message;
import org.neo4j.bolt.connection.netty.impl.messaging.MessageEncoder;
-import org.neo4j.bolt.connection.netty.impl.messaging.ValuePacker;
import org.neo4j.bolt.connection.netty.impl.messaging.response.FailureMessage;
+import org.neo4j.bolt.connection.packstream.value.ValuePacker;
import org.neo4j.bolt.connection.values.Value;
import org.neo4j.bolt.connection.values.ValueFactory;
diff --git a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/util/messaging/IgnoredMessageEncoder.java b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/util/messaging/IgnoredMessageEncoder.java
index 9f8b0c13..9f79ceb6 100644
--- a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/util/messaging/IgnoredMessageEncoder.java
+++ b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/util/messaging/IgnoredMessageEncoder.java
@@ -19,8 +19,8 @@
import java.io.IOException;
import org.neo4j.bolt.connection.netty.impl.messaging.Message;
import org.neo4j.bolt.connection.netty.impl.messaging.MessageEncoder;
-import org.neo4j.bolt.connection.netty.impl.messaging.ValuePacker;
import org.neo4j.bolt.connection.netty.impl.messaging.response.IgnoredMessage;
+import org.neo4j.bolt.connection.packstream.value.ValuePacker;
import org.neo4j.bolt.connection.values.ValueFactory;
public class IgnoredMessageEncoder implements MessageEncoder {
diff --git a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/util/messaging/KnowledgeableMessageFormat.java b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/util/messaging/KnowledgeableMessageFormat.java
index 34c58f6c..818ff5e6 100644
--- a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/util/messaging/KnowledgeableMessageFormat.java
+++ b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/util/messaging/KnowledgeableMessageFormat.java
@@ -23,8 +23,6 @@
import java.util.stream.StreamSupport;
import org.neo4j.bolt.connection.netty.impl.messaging.AbstractMessageWriter;
import org.neo4j.bolt.connection.netty.impl.messaging.MessageEncoder;
-import org.neo4j.bolt.connection.netty.impl.messaging.common.CommonValuePacker;
-import org.neo4j.bolt.connection.netty.impl.messaging.common.CommonValueUnpacker;
import org.neo4j.bolt.connection.netty.impl.messaging.encode.DiscardAllMessageEncoder;
import org.neo4j.bolt.connection.netty.impl.messaging.encode.PullAllMessageEncoder;
import org.neo4j.bolt.connection.netty.impl.messaging.encode.ResetMessageEncoder;
@@ -36,7 +34,9 @@
import org.neo4j.bolt.connection.netty.impl.messaging.response.RecordMessage;
import org.neo4j.bolt.connection.netty.impl.messaging.response.SuccessMessage;
import org.neo4j.bolt.connection.netty.impl.messaging.v3.MessageFormatV3;
-import org.neo4j.bolt.connection.netty.impl.packstream.PackOutput;
+import org.neo4j.bolt.connection.packstream.PackOutput;
+import org.neo4j.bolt.connection.packstream.value.CommonValuePacker;
+import org.neo4j.bolt.connection.packstream.value.CommonValueUnpacker;
import org.neo4j.bolt.connection.test.values.TestNode;
import org.neo4j.bolt.connection.test.values.TestPath;
import org.neo4j.bolt.connection.test.values.TestRelationship;
diff --git a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/util/messaging/RecordMessageEncoder.java b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/util/messaging/RecordMessageEncoder.java
index 0660a9c9..4ac0f801 100644
--- a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/util/messaging/RecordMessageEncoder.java
+++ b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/util/messaging/RecordMessageEncoder.java
@@ -19,8 +19,8 @@
import java.io.IOException;
import org.neo4j.bolt.connection.netty.impl.messaging.Message;
import org.neo4j.bolt.connection.netty.impl.messaging.MessageEncoder;
-import org.neo4j.bolt.connection.netty.impl.messaging.ValuePacker;
import org.neo4j.bolt.connection.netty.impl.messaging.response.RecordMessage;
+import org.neo4j.bolt.connection.packstream.value.ValuePacker;
import org.neo4j.bolt.connection.values.ValueFactory;
public class RecordMessageEncoder implements MessageEncoder {
diff --git a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/util/messaging/SuccessMessageEncoder.java b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/util/messaging/SuccessMessageEncoder.java
index 330a8d8c..299dd881 100644
--- a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/util/messaging/SuccessMessageEncoder.java
+++ b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/util/messaging/SuccessMessageEncoder.java
@@ -19,8 +19,8 @@
import java.io.IOException;
import org.neo4j.bolt.connection.netty.impl.messaging.Message;
import org.neo4j.bolt.connection.netty.impl.messaging.MessageEncoder;
-import org.neo4j.bolt.connection.netty.impl.messaging.ValuePacker;
import org.neo4j.bolt.connection.netty.impl.messaging.response.SuccessMessage;
+import org.neo4j.bolt.connection.packstream.value.ValuePacker;
import org.neo4j.bolt.connection.values.ValueFactory;
public class SuccessMessageEncoder implements MessageEncoder {
diff --git a/neo4j-bolt-connection-packstream/LICENSES.txt b/neo4j-bolt-connection-packstream/LICENSES.txt
new file mode 100644
index 00000000..79316830
--- /dev/null
+++ b/neo4j-bolt-connection-packstream/LICENSES.txt
@@ -0,0 +1,214 @@
+This file contains the full license text of the included third party
+libraries. For an overview of the licenses see the NOTICE.txt file.
+
+
+------------------------------------------------------------------------------
+Apache Software License, Version 2.0
+ Neo4j Bolt Connection (Provider SPI)
+------------------------------------------------------------------------------
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+
+
+
diff --git a/neo4j-bolt-connection-packstream/NOTICE.txt b/neo4j-bolt-connection-packstream/NOTICE.txt
new file mode 100644
index 00000000..8acd2aef
--- /dev/null
+++ b/neo4j-bolt-connection-packstream/NOTICE.txt
@@ -0,0 +1,23 @@
+Copyright (c) "Neo4j"
+Neo4j Sweden AB [https://neo4j.com]
+
+This file is part of Neo4j.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+Full license texts are found in LICENSES.txt.
+
+
+Third-party licenses
+--------------------
+
+Apache Software License, Version 2.0
+ Neo4j Bolt Connection (Provider SPI)
+
diff --git a/neo4j-bolt-connection-packstream/pom.xml b/neo4j-bolt-connection-packstream/pom.xml
new file mode 100644
index 00000000..e200bf75
--- /dev/null
+++ b/neo4j-bolt-connection-packstream/pom.xml
@@ -0,0 +1,76 @@
+
+
+ 4.0.0
+
+
+ org.neo4j.bolt
+ neo4j-bolt-connection-parent
+ 11.0-SNAPSHOT
+
+
+ neo4j-bolt-connection-packstream
+
+ jar
+ Neo4j Bolt Connection PackStream
+
+
+ ,-try
+ false
+ ${project.basedir}/..
+
+
+
+
+
+ org.neo4j.bolt
+ neo4j-bolt-connection-bom
+ ${project.version}
+ pom
+ import
+
+
+
+
+
+
+ org.neo4j.bolt
+ neo4j-bolt-connection
+
+
+ org.junit.jupiter
+ junit-jupiter
+ test
+
+
+
+ org.mockito
+ mockito-core
+ test
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-source-plugin
+
+
+ org.apache.maven.plugins
+ maven-javadoc-plugin
+
+
+ org.apache.maven.plugins
+ maven-failsafe-plugin
+
+
+ org.apache.maven.surefire
+ surefire-junit-platform
+ ${surefire.and.failsafe.version}
+
+
+
+
+
+
+
diff --git a/neo4j-bolt-connection-packstream/src/main/java/module-info.java b/neo4j-bolt-connection-packstream/src/main/java/module-info.java
new file mode 100644
index 00000000..9644b67c
--- /dev/null
+++ b/neo4j-bolt-connection-packstream/src/main/java/module-info.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) "Neo4j"
+ * Neo4j Sweden AB [https://neo4j.com]
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * The Neo4j Bolt Connection PackStream module.
+ */
+module org.neo4j.bolt.connection.packstream {
+ exports org.neo4j.bolt.connection.packstream;
+ exports org.neo4j.bolt.connection.packstream.value;
+
+ requires org.neo4j.bolt.connection;
+}
diff --git a/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/packstream/PackInput.java b/neo4j-bolt-connection-packstream/src/main/java/org/neo4j/bolt/connection/packstream/PackInput.java
similarity index 96%
rename from neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/packstream/PackInput.java
rename to neo4j-bolt-connection-packstream/src/main/java/org/neo4j/bolt/connection/packstream/PackInput.java
index 0c0cab87..0deeeb72 100644
--- a/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/packstream/PackInput.java
+++ b/neo4j-bolt-connection-packstream/src/main/java/org/neo4j/bolt/connection/packstream/PackInput.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.neo4j.bolt.connection.netty.impl.packstream;
+package org.neo4j.bolt.connection.packstream;
import java.io.IOException;
diff --git a/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/packstream/PackOutput.java b/neo4j-bolt-connection-packstream/src/main/java/org/neo4j/bolt/connection/packstream/PackOutput.java
similarity index 96%
rename from neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/packstream/PackOutput.java
rename to neo4j-bolt-connection-packstream/src/main/java/org/neo4j/bolt/connection/packstream/PackOutput.java
index ed9c2ea4..01c1a5c3 100644
--- a/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/packstream/PackOutput.java
+++ b/neo4j-bolt-connection-packstream/src/main/java/org/neo4j/bolt/connection/packstream/PackOutput.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.neo4j.bolt.connection.netty.impl.packstream;
+package org.neo4j.bolt.connection.packstream;
import java.io.IOException;
diff --git a/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/packstream/PackStream.java b/neo4j-bolt-connection-packstream/src/main/java/org/neo4j/bolt/connection/packstream/PackStream.java
similarity index 99%
rename from neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/packstream/PackStream.java
rename to neo4j-bolt-connection-packstream/src/main/java/org/neo4j/bolt/connection/packstream/PackStream.java
index 4218e834..8dd79a85 100644
--- a/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/packstream/PackStream.java
+++ b/neo4j-bolt-connection-packstream/src/main/java/org/neo4j/bolt/connection/packstream/PackStream.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.neo4j.bolt.connection.netty.impl.packstream;
+package org.neo4j.bolt.connection.packstream;
import static java.lang.Integer.toHexString;
import static java.lang.String.format;
diff --git a/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/packstream/PackType.java b/neo4j-bolt-connection-packstream/src/main/java/org/neo4j/bolt/connection/packstream/PackType.java
similarity index 92%
rename from neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/packstream/PackType.java
rename to neo4j-bolt-connection-packstream/src/main/java/org/neo4j/bolt/connection/packstream/PackType.java
index 61139bde..7ea89399 100644
--- a/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/packstream/PackType.java
+++ b/neo4j-bolt-connection-packstream/src/main/java/org/neo4j/bolt/connection/packstream/PackType.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.neo4j.bolt.connection.netty.impl.packstream;
+package org.neo4j.bolt.connection.packstream;
public enum PackType {
NULL,
diff --git a/neo4j-bolt-connection-packstream/src/main/java/org/neo4j/bolt/connection/packstream/StructVersion.java b/neo4j-bolt-connection-packstream/src/main/java/org/neo4j/bolt/connection/packstream/StructVersion.java
new file mode 100644
index 00000000..352dfc8b
--- /dev/null
+++ b/neo4j-bolt-connection-packstream/src/main/java/org/neo4j/bolt/connection/packstream/StructVersion.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) "Neo4j"
+ * Neo4j Sweden AB [https://neo4j.com]
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.neo4j.bolt.connection.packstream;
+
+public enum StructVersion {
+ COMMON,
+ V43,
+ V44,
+ V5,
+ V6
+}
diff --git a/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/common/CommonValuePacker.java b/neo4j-bolt-connection-packstream/src/main/java/org/neo4j/bolt/connection/packstream/value/CommonValuePacker.java
similarity index 97%
rename from neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/common/CommonValuePacker.java
rename to neo4j-bolt-connection-packstream/src/main/java/org/neo4j/bolt/connection/packstream/value/CommonValuePacker.java
index 7d96ade0..7bc23096 100644
--- a/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/common/CommonValuePacker.java
+++ b/neo4j-bolt-connection-packstream/src/main/java/org/neo4j/bolt/connection/packstream/value/CommonValuePacker.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.neo4j.bolt.connection.netty.impl.messaging.common;
+package org.neo4j.bolt.connection.packstream.value;
import static java.time.ZoneOffset.UTC;
@@ -28,9 +28,8 @@
import java.util.Map;
import org.neo4j.bolt.connection.exception.BoltClientException;
import org.neo4j.bolt.connection.exception.BoltUnsupportedFeatureException;
-import org.neo4j.bolt.connection.netty.impl.messaging.ValuePacker;
-import org.neo4j.bolt.connection.netty.impl.packstream.PackOutput;
-import org.neo4j.bolt.connection.netty.impl.packstream.PackStream;
+import org.neo4j.bolt.connection.packstream.PackOutput;
+import org.neo4j.bolt.connection.packstream.PackStream;
import org.neo4j.bolt.connection.values.IsoDuration;
import org.neo4j.bolt.connection.values.Point;
import org.neo4j.bolt.connection.values.Value;
diff --git a/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/common/CommonValueUnpacker.java b/neo4j-bolt-connection-packstream/src/main/java/org/neo4j/bolt/connection/packstream/value/CommonValueUnpacker.java
similarity index 98%
rename from neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/common/CommonValueUnpacker.java
rename to neo4j-bolt-connection-packstream/src/main/java/org/neo4j/bolt/connection/packstream/value/CommonValueUnpacker.java
index 6aa118ab..cfc7f62e 100644
--- a/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/common/CommonValueUnpacker.java
+++ b/neo4j-bolt-connection-packstream/src/main/java/org/neo4j/bolt/connection/packstream/value/CommonValueUnpacker.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.neo4j.bolt.connection.netty.impl.messaging.common;
+package org.neo4j.bolt.connection.packstream.value;
import static java.time.ZoneOffset.UTC;
@@ -38,9 +38,8 @@
import java.util.function.Supplier;
import org.neo4j.bolt.connection.exception.BoltClientException;
import org.neo4j.bolt.connection.exception.BoltProtocolException;
-import org.neo4j.bolt.connection.netty.impl.messaging.ValueUnpacker;
-import org.neo4j.bolt.connection.netty.impl.packstream.PackInput;
-import org.neo4j.bolt.connection.netty.impl.packstream.PackStream;
+import org.neo4j.bolt.connection.packstream.PackInput;
+import org.neo4j.bolt.connection.packstream.PackStream;
import org.neo4j.bolt.connection.values.Node;
import org.neo4j.bolt.connection.values.Path;
import org.neo4j.bolt.connection.values.Relationship;
@@ -135,7 +134,7 @@ public List unpackList() throws IOException {
return Arrays.asList(values);
}
- protected Value unpack() throws IOException {
+ public Value unpack() throws IOException {
var type = unpacker.peekNextType();
switch (type) {
case NULL -> {
diff --git a/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/ValuePacker.java b/neo4j-bolt-connection-packstream/src/main/java/org/neo4j/bolt/connection/packstream/value/ValuePacker.java
similarity index 94%
rename from neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/ValuePacker.java
rename to neo4j-bolt-connection-packstream/src/main/java/org/neo4j/bolt/connection/packstream/value/ValuePacker.java
index e6f15e15..e963a6fb 100644
--- a/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/ValuePacker.java
+++ b/neo4j-bolt-connection-packstream/src/main/java/org/neo4j/bolt/connection/packstream/value/ValuePacker.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.neo4j.bolt.connection.netty.impl.messaging;
+package org.neo4j.bolt.connection.packstream.value;
import java.io.IOException;
import java.util.Map;
diff --git a/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/v6/ValuePackerV6.java b/neo4j-bolt-connection-packstream/src/main/java/org/neo4j/bolt/connection/packstream/value/ValuePackerV6.java
similarity index 90%
rename from neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/v6/ValuePackerV6.java
rename to neo4j-bolt-connection-packstream/src/main/java/org/neo4j/bolt/connection/packstream/value/ValuePackerV6.java
index 22bfd9af..916999e0 100644
--- a/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/v6/ValuePackerV6.java
+++ b/neo4j-bolt-connection-packstream/src/main/java/org/neo4j/bolt/connection/packstream/value/ValuePackerV6.java
@@ -14,16 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.neo4j.bolt.connection.netty.impl.messaging.v6;
+package org.neo4j.bolt.connection.packstream.value;
import java.io.IOException;
import java.lang.reflect.Array;
-import org.neo4j.bolt.connection.netty.impl.messaging.common.CommonValuePacker;
-import org.neo4j.bolt.connection.netty.impl.packstream.PackOutput;
-import org.neo4j.bolt.connection.netty.impl.packstream.PackStream;
+import org.neo4j.bolt.connection.packstream.PackOutput;
+import org.neo4j.bolt.connection.packstream.PackStream;
import org.neo4j.bolt.connection.values.Vector;
-final class ValuePackerV6 extends CommonValuePacker {
+public final class ValuePackerV6 extends CommonValuePacker {
public ValuePackerV6(PackOutput output) {
super(output, true);
}
diff --git a/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/ValueUnpacker.java b/neo4j-bolt-connection-packstream/src/main/java/org/neo4j/bolt/connection/packstream/value/ValueUnpacker.java
similarity index 94%
rename from neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/ValueUnpacker.java
rename to neo4j-bolt-connection-packstream/src/main/java/org/neo4j/bolt/connection/packstream/value/ValueUnpacker.java
index 0ba6e78d..005432fa 100644
--- a/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/ValueUnpacker.java
+++ b/neo4j-bolt-connection-packstream/src/main/java/org/neo4j/bolt/connection/packstream/value/ValueUnpacker.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.neo4j.bolt.connection.netty.impl.messaging;
+package org.neo4j.bolt.connection.packstream.value;
import java.io.IOException;
import java.util.List;
diff --git a/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/v5/ValueUnpackerV5.java b/neo4j-bolt-connection-packstream/src/main/java/org/neo4j/bolt/connection/packstream/value/ValueUnpackerV5.java
similarity index 96%
rename from neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/v5/ValueUnpackerV5.java
rename to neo4j-bolt-connection-packstream/src/main/java/org/neo4j/bolt/connection/packstream/value/ValueUnpackerV5.java
index 4025454e..903785d2 100644
--- a/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/v5/ValueUnpackerV5.java
+++ b/neo4j-bolt-connection-packstream/src/main/java/org/neo4j/bolt/connection/packstream/value/ValueUnpackerV5.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.neo4j.bolt.connection.netty.impl.messaging.v5;
+package org.neo4j.bolt.connection.packstream.value;
import java.io.IOException;
import java.util.ArrayList;
@@ -22,8 +22,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.neo4j.bolt.connection.netty.impl.messaging.common.CommonValueUnpacker;
-import org.neo4j.bolt.connection.netty.impl.packstream.PackInput;
+import org.neo4j.bolt.connection.packstream.PackInput;
import org.neo4j.bolt.connection.values.Node;
import org.neo4j.bolt.connection.values.Path;
import org.neo4j.bolt.connection.values.Relationship;
diff --git a/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/v6/ValueUnpackerV6.java b/neo4j-bolt-connection-packstream/src/main/java/org/neo4j/bolt/connection/packstream/value/ValueUnpackerV6.java
similarity index 92%
rename from neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/v6/ValueUnpackerV6.java
rename to neo4j-bolt-connection-packstream/src/main/java/org/neo4j/bolt/connection/packstream/value/ValueUnpackerV6.java
index a6592d58..ed0b4205 100644
--- a/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/messaging/v6/ValueUnpackerV6.java
+++ b/neo4j-bolt-connection-packstream/src/main/java/org/neo4j/bolt/connection/packstream/value/ValueUnpackerV6.java
@@ -14,20 +14,19 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.neo4j.bolt.connection.netty.impl.messaging.v6;
+package org.neo4j.bolt.connection.packstream.value;
import java.io.IOException;
import java.lang.reflect.Array;
import org.neo4j.bolt.connection.BoltProtocolVersion;
import org.neo4j.bolt.connection.exception.BoltProtocolException;
-import org.neo4j.bolt.connection.netty.impl.messaging.v5.ValueUnpackerV5;
-import org.neo4j.bolt.connection.netty.impl.packstream.PackInput;
-import org.neo4j.bolt.connection.netty.impl.packstream.PackStream;
+import org.neo4j.bolt.connection.packstream.PackInput;
+import org.neo4j.bolt.connection.packstream.PackStream;
import org.neo4j.bolt.connection.values.Type;
import org.neo4j.bolt.connection.values.Value;
import org.neo4j.bolt.connection.values.ValueFactory;
-final class ValueUnpackerV6 extends ValueUnpackerV5 {
+public final class ValueUnpackerV6 extends ValueUnpackerV5 {
public ValueUnpackerV6(PackInput input, ValueFactory valueFactory) {
super(input, valueFactory);
}
diff --git a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/util/io/BufferedChannelInput.java b/neo4j-bolt-connection-packstream/src/test/java/org/neo4j/bolt/connection/packstream/BufferedChannelInput.java
similarity index 95%
rename from neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/util/io/BufferedChannelInput.java
rename to neo4j-bolt-connection-packstream/src/test/java/org/neo4j/bolt/connection/packstream/BufferedChannelInput.java
index 8d137524..adb98769 100644
--- a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/util/io/BufferedChannelInput.java
+++ b/neo4j-bolt-connection-packstream/src/test/java/org/neo4j/bolt/connection/packstream/BufferedChannelInput.java
@@ -14,14 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.neo4j.bolt.connection.netty.impl.util.io;
+package org.neo4j.bolt.connection.packstream;
import java.io.IOException;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
import java.nio.channels.ReadableByteChannel;
-import org.neo4j.bolt.connection.netty.impl.packstream.PackInput;
-import org.neo4j.bolt.connection.netty.impl.packstream.PackStream;
/**
* An {@link PackInput} implementation that reads from an input channel into an internal buffer.
diff --git a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/util/io/ChannelOutput.java b/neo4j-bolt-connection-packstream/src/test/java/org/neo4j/bolt/connection/packstream/ChannelOutput.java
similarity index 95%
rename from neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/util/io/ChannelOutput.java
rename to neo4j-bolt-connection-packstream/src/test/java/org/neo4j/bolt/connection/packstream/ChannelOutput.java
index 55f3b7ba..50de53f3 100644
--- a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/util/io/ChannelOutput.java
+++ b/neo4j-bolt-connection-packstream/src/test/java/org/neo4j/bolt/connection/packstream/ChannelOutput.java
@@ -14,12 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.neo4j.bolt.connection.netty.impl.util.io;
+package org.neo4j.bolt.connection.packstream;
import java.io.IOException;
import java.nio.ByteBuffer;
import java.nio.channels.WritableByteChannel;
-import org.neo4j.bolt.connection.netty.impl.packstream.PackOutput;
public class ChannelOutput implements PackOutput {
private final WritableByteChannel channel;
diff --git a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/packstream/PackStreamTest.java b/neo4j-bolt-connection-packstream/src/test/java/org/neo4j/bolt/connection/packstream/PackStreamTest.java
similarity index 99%
rename from neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/packstream/PackStreamTest.java
rename to neo4j-bolt-connection-packstream/src/test/java/org/neo4j/bolt/connection/packstream/PackStreamTest.java
index 0ca986c2..c3d70080 100644
--- a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/packstream/PackStreamTest.java
+++ b/neo4j-bolt-connection-packstream/src/test/java/org/neo4j/bolt/connection/packstream/PackStreamTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.neo4j.bolt.connection.netty.impl.packstream;
+package org.neo4j.bolt.connection.packstream;
import static java.util.Arrays.asList;
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
@@ -35,8 +35,6 @@
import java.util.stream.Collectors;
import java.util.stream.IntStream;
import org.junit.jupiter.api.Test;
-import org.neo4j.bolt.connection.netty.impl.util.io.BufferedChannelInput;
-import org.neo4j.bolt.connection.netty.impl.util.io.ChannelOutput;
public class PackStreamTest {
public static Map asMap(Object... keysAndValues) {
diff --git a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/common/CommonValueUnpackerTest.java b/neo4j-bolt-connection-packstream/src/test/java/org/neo4j/bolt/connection/packstream/value/CommonValueUnpackerTest.java
similarity index 95%
rename from neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/common/CommonValueUnpackerTest.java
rename to neo4j-bolt-connection-packstream/src/test/java/org/neo4j/bolt/connection/packstream/value/CommonValueUnpackerTest.java
index f85fe843..10cc0e71 100644
--- a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/messaging/common/CommonValueUnpackerTest.java
+++ b/neo4j-bolt-connection-packstream/src/test/java/org/neo4j/bolt/connection/packstream/value/CommonValueUnpackerTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.neo4j.bolt.connection.netty.impl.messaging.common;
+package org.neo4j.bolt.connection.packstream.value;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.Mockito.mock;
diff --git a/pom.xml b/pom.xml
index 0cf9615f..f345eb35 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,6 +32,7 @@
neo4j-bolt-connection-bom
neo4j-bolt-connection
neo4j-bolt-connection-test-values
+ neo4j-bolt-connection-packstream
neo4j-bolt-connection-netty
neo4j-bolt-connection-pooled
neo4j-bolt-connection-routed