Address review comments

community/bolt/src/main/java/org/neo4j/bolt/messaging/KnownType.java → community/bolt/src/main/java/org/neo4j/bolt/messaging/StructType.java

@@ -27,7 +27,7 @@
 
 import static java.util.Collections.unmodifiableMap;
 
-public enum KnownType
+public enum StructType
 {
     NODE( Neo4jPackV1.NODE, "Node" ),
     RELATIONSHIP( Neo4jPackV1.RELATIONSHIP, "Relationship" ),
@@ -46,7 +46,7 @@ public enum KnownType
     private final byte signature;
     private final String description;
 
-    KnownType( byte signature, String description )
+    StructType( byte signature, String description )
     {
         this.signature = signature;
         this.description = description;
@@ -62,23 +62,23 @@ public String description()
         return description;
     }
 
-    private static Map<Byte, KnownType> knownTypesBySignature = knownTypesBySignature();
+    private static Map<Byte,StructType> knownTypesBySignature = knownTypesBySignature();
 
-    public static KnownType valueOf( byte signature )
+    public static StructType valueOf( byte signature )
     {
         return knownTypesBySignature.get( signature );
     }
 
-    public static KnownType valueOf( char signature )
+    public static StructType valueOf( char signature )
     {
         return knownTypesBySignature.get( (byte)signature );
     }
 
-    private static Map<Byte,KnownType> knownTypesBySignature()
+    private static Map<Byte,StructType> knownTypesBySignature()
     {
-        KnownType[] types = KnownType.values();
-        Map<Byte,KnownType> result = new HashMap<>( types.length * 2 );
-        for ( KnownType type : types )
+        StructType[] types = StructType.values();
+        Map<Byte,StructType> result = new HashMap<>( types.length * 2 );
+        for ( StructType type : types )
         {
             result.put( type.signature, type );
         }

community/bolt/src/main/java/org/neo4j/bolt/transport/pipeline/MessageAccumulator.java

@@ -30,11 +30,6 @@ public class MessageAccumulator extends ByteToMessageDecoder
 {
     private boolean readMessageBoundary;
 
-    public MessageAccumulator()
-    {
-
-    }
-
     @Override
     public void channelRead( ChannelHandlerContext ctx, Object msg ) throws Exception
     {

community/bolt/src/main/java/org/neo4j/bolt/transport/pipeline/ProtocolHandshaker.java

@@ -20,7 +20,6 @@
 package org.neo4j.bolt.transport.pipeline;
 
 import io.netty.buffer.ByteBuf;
-import io.netty.buffer.Unpooled;
 import io.netty.channel.ChannelFutureListener;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelInboundHandlerAdapter;
@@ -107,7 +106,7 @@ public void channelRead( ChannelHandlerContext ctx, Object msg )
                     }
                     else
                     {
-                        ctx.writeAndFlush( Unpooled.wrappedBuffer( new byte[]{0, 0, 0, 0} ) ).addListener( ChannelFutureListener.CLOSE );
+                        ctx.writeAndFlush( ctx.alloc().buffer().writeBytes( new byte[]{0, 0, 0, 0} ) ).addListener( ChannelFutureListener.CLOSE );
                     }
                 }
                 else

community/bolt/src/main/java/org/neo4j/bolt/v1/messaging/Neo4jPackV1.java

@@ -30,7 +30,7 @@
 import java.util.List;
 import java.util.Map;
 
-import org.neo4j.bolt.messaging.KnownType;
+import org.neo4j.bolt.messaging.StructType;
 import org.neo4j.bolt.v1.packstream.PackInput;
 import org.neo4j.bolt.v1.packstream.PackOutput;
 import org.neo4j.bolt.v1.packstream.PackStream;
@@ -523,15 +523,15 @@ else if ( size == UNKNOWN_SIZE )
 
         protected AnyValue unpackStruct( char signature, long size ) throws IOException
         {
-            KnownType knownType = KnownType.valueOf( signature );
-            if ( knownType == null )
+            StructType structType = StructType.valueOf( signature );
+            if ( structType == null )
             {
                 throw new BoltIOException( Status.Request.InvalidFormat,
                         String.format( "Struct types of 0x%s are not recognized.", Integer.toHexString( signature ) ) );
             }
 
             throw new BoltIOException( Status.Statement.TypeError,
-                    String.format( "%s values cannot be unpacked with this version of bolt.", knownType.description() ) );
+                    String.format( "%s values cannot be unpacked with this version of bolt.", structType.description() ) );
         }
 
         @Override

community/bolt/src/main/java/org/neo4j/bolt/v1/packstream/ByteBufInput.java

@@ -83,12 +83,6 @@ public byte peekByte()
         return buf.getByte( buf.readerIndex() );
     }
 
-    @Override
-    public void close() throws IOException
-    {
-        stop();
-    }
-
     private void assertNotStarted()
     {
         if ( buf != null )

community/bolt/src/main/java/org/neo4j/bolt/v1/packstream/PackInput.java

@@ -19,14 +19,13 @@
  */
 package org.neo4j.bolt.v1.packstream;
 
-import java.io.Closeable;
 import java.io.IOException;
 
 /**
  * This is what {@link PackStream} uses to ingest data, implement this on top of any data source of your choice to
  * deserialize the stream with {@link PackStream}.
  */
-public interface PackInput extends Closeable
+public interface PackInput
 {
     /** Consume one byte */
     byte readByte() throws IOException;

community/bolt/src/main/java/org/neo4j/bolt/v1/packstream/PackStream.java

@@ -23,7 +23,7 @@
 import java.nio.ByteBuffer;
 import java.nio.charset.StandardCharsets;
 
-import org.neo4j.bolt.messaging.KnownType;
+import org.neo4j.bolt.messaging.StructType;
 import org.neo4j.bolt.v1.packstream.utf8.UTF8Encoder;
 
 /**
@@ -766,13 +766,13 @@ public PackType peekNextType() throws IOException
             return type( markerByte );
         }
 
-        public static void ensureCorrectStructSize( KnownType knownType, int expected, long actual ) throws IOException
+        public static void ensureCorrectStructSize( StructType structType, int expected, long actual ) throws IOException
         {
             if ( expected != actual )
             {
                 throw new PackStreamException(
                         String.format( "Invalid message received, serialized %s structures should have %d fields, " + "received %s structure has %d fields.",
-                                knownType.description(), expected, knownType.description(), actual ) );
+                                structType.description(), expected, structType.description(), actual ) );
             }
         }
     }

community/bolt/src/main/java/org/neo4j/bolt/v1/packstream/PackedInputArray.java

@@ -81,10 +81,4 @@ public byte peekByte() throws IOException
         data.reset();
         return value;
     }
-
-    @Override
-    public void close() throws IOException
-    {
-        data.close();
-    }
 }

community/bolt/src/main/java/org/neo4j/bolt/v2/messaging/Neo4jPackV2.java

@@ -30,7 +30,7 @@
 import java.time.ZonedDateTime;
 import java.util.Arrays;
 
-import org.neo4j.bolt.messaging.KnownType;
+import org.neo4j.bolt.messaging.StructType;
 import org.neo4j.bolt.v1.messaging.BoltIOException;
 import org.neo4j.bolt.v1.messaging.Neo4jPack;
 import org.neo4j.bolt.v1.messaging.Neo4jPackV1;
@@ -232,31 +232,31 @@ protected AnyValue unpackStruct( char signature, long size ) throws IOException
                 switch ( signature )
                 {
                 case POINT_2D:
-                    ensureCorrectStructSize( KnownType.POINT_2D, POINT_2D_SIZE, size );
+                    ensureCorrectStructSize( StructType.POINT_2D, POINT_2D_SIZE, size );
                     return unpackPoint2D();
                 case POINT_3D:
-                    ensureCorrectStructSize( KnownType.POINT_3D, POINT_3D_SIZE, size );
+                    ensureCorrectStructSize( StructType.POINT_3D, POINT_3D_SIZE, size );
                     return unpackPoint3D();
                 case DURATION:
-                    ensureCorrectStructSize( KnownType.DURATION, DURATION_SIZE, size );
+                    ensureCorrectStructSize( StructType.DURATION, DURATION_SIZE, size );
                     return unpackDuration();
                 case DATE:
-                    ensureCorrectStructSize( KnownType.DATE, DATE_SIZE, size );
+                    ensureCorrectStructSize( StructType.DATE, DATE_SIZE, size );
                     return unpackDate();
                 case LOCAL_TIME:
-                    ensureCorrectStructSize( KnownType.LOCAL_TIME, LOCAL_TIME_SIZE, size );
+                    ensureCorrectStructSize( StructType.LOCAL_TIME, LOCAL_TIME_SIZE, size );
                     return unpackLocalTime();
                 case TIME:
-                    ensureCorrectStructSize( KnownType.TIME, TIME_SIZE, size );
+                    ensureCorrectStructSize( StructType.TIME, TIME_SIZE, size );
                     return unpackTime();
                 case LOCAL_DATE_TIME:
-                    ensureCorrectStructSize( KnownType.LOCAL_DATE_TIME, LOCAL_DATE_TIME_SIZE, size );
+                    ensureCorrectStructSize( StructType.LOCAL_DATE_TIME, LOCAL_DATE_TIME_SIZE, size );
                     return unpackLocalDateTime();
                 case DATE_TIME_WITH_ZONE_OFFSET:
-                    ensureCorrectStructSize( KnownType.DATE_TIME_WITH_ZONE_OFFSET, DATE_TIME_WITH_ZONE_OFFSET_SIZE, size );
+                    ensureCorrectStructSize( StructType.DATE_TIME_WITH_ZONE_OFFSET, DATE_TIME_WITH_ZONE_OFFSET_SIZE, size );
                     return unpackDateTimeWithZoneOffset();
                 case DATE_TIME_WITH_ZONE_NAME:
-                    ensureCorrectStructSize( KnownType.DATE_TIME_WITH_ZONE_NAME, DATE_TIME_WITH_ZONE_NAME_SIZE, size );
+                    ensureCorrectStructSize( StructType.DATE_TIME_WITH_ZONE_NAME, DATE_TIME_WITH_ZONE_NAME_SIZE, size );
                     return unpackDateTimeWithZoneName();
                 default:
                     return super.unpackStruct( signature, size );
@@ -268,7 +268,7 @@ protected AnyValue unpackStruct( char signature, long size ) throws IOException
             }
             catch ( Throwable ex )
             {
-                KnownType type = KnownType.valueOf( signature );
+                StructType type = StructType.valueOf( signature );
                 if ( type != null )
                 {
                     throw new BoltIOException( Status.Statement.TypeError,

community/bolt/src/test/java/org/neo4j/bolt/v1/packstream/BufferedChannelInput.java

@@ -137,17 +137,6 @@ public byte peekByte() throws IOException
         return buffer.get( buffer.position() );
     }
 
-    @Override
-    public void close() throws IOException
-    {
-        buffer.clear();
-
-        if ( channel != null )
-        {
-            channel.close();
-        }
-    }
-
     private void ensure( int numBytes ) throws IOException
     {
         if ( !attempt( numBytes ) )

community/bolt/src/test/java/org/neo4j/bolt/v1/transport/integration/UnsupportedKnownTypesV1IT.java → community/bolt/src/test/java/org/neo4j/bolt/v1/transport/integration/UnsupportedStructTypesV1IT.java

@@ -63,7 +63,7 @@
 import static org.neo4j.values.storable.Values.pointValue;
 
 @RunWith( Parameterized.class )
-public class UnsupportedKnownTypesV1IT
+public class UnsupportedStructTypesV1IT
 {
     private static final String USER_AGENT = "TestClient/1.0";
 

community/bolt/src/test/java/org/neo4j/bolt/v1/transport/integration/UnsupportedKnownTypesV1V2IT.java → community/bolt/src/test/java/org/neo4j/bolt/v1/transport/integration/UnsupportedStructTypesV1V2IT.java

@@ -45,7 +45,7 @@
 import static org.neo4j.bolt.v1.transport.integration.TransportTestUtil.eventuallyDisconnects;
 import static org.neo4j.graphdb.factory.GraphDatabaseSettings.auth_enabled;
 
-public class UnsupportedKnownTypesV1V2IT extends AbstractBoltTransportsTest
+public class UnsupportedStructTypesV1V2IT extends AbstractBoltTransportsTest
 {
     private static final String USER_AGENT = "TestClient/1.0";
 

community/bolt/src/test/java/org/neo4j/bolt/v2/transport/integration/UnsupportedKnownTypesV2IT.java → community/bolt/src/test/java/org/neo4j/bolt/v2/transport/integration/UnsupportedStructTypesV2IT.java

@@ -30,7 +30,7 @@
 import java.util.Collections;
 import java.util.List;
 
-import org.neo4j.bolt.messaging.KnownType;
+import org.neo4j.bolt.messaging.StructType;
 import org.neo4j.bolt.v1.messaging.BoltRequestMessage;
 import org.neo4j.bolt.v1.messaging.Neo4jPack;
 import org.neo4j.bolt.v1.packstream.PackedOutputArray;
@@ -57,7 +57,7 @@
 import static org.neo4j.graphdb.factory.GraphDatabaseSettings.auth_enabled;
 
 @RunWith( Parameterized.class )
-public class UnsupportedKnownTypesV2IT
+public class UnsupportedStructTypesV2IT
 {
     private static final String USER_AGENT = "TestClient/2.0";
 
@@ -99,7 +99,7 @@ public void shouldFailWhenPoint2DIsSentWithInvalidCrsId() throws Exception
     {
         testFailureWithUnpackableValue( packer ->
         {
-            packer.packStructHeader( 3, KnownType.POINT_2D.signature() );
+            packer.packStructHeader( 3, StructType.POINT_2D.signature() );
             packer.pack( Values.of( 5 ) );
             packer.pack( Values.of( 3.15 ) );
             packer.pack( Values.of( 4.012 ) );
@@ -111,7 +111,7 @@ public void shouldFailWhenPoint3DIsSentWithInvalidCrsId() throws Exception
     {
         testFailureWithUnpackableValue( packer ->
         {
-            packer.packStructHeader( 4, KnownType.POINT_3D.signature() );
+            packer.packStructHeader( 4, StructType.POINT_3D.signature() );
             packer.pack( Values.of( 1200 ) );
             packer.pack( Values.of( 3.15 ) );
             packer.pack( Values.of( 4.012 ) );
@@ -124,7 +124,7 @@ public void shouldFailWhenPoint2DDimensionsDoNotMatch() throws Exception
     {
         testDisconnectWithUnpackableValue( packer ->
         {
-            packer.packStructHeader( 3, KnownType.POINT_3D.signature() );
+            packer.packStructHeader( 3, StructType.POINT_3D.signature() );
             packer.pack( Values.of( CoordinateReferenceSystem.Cartesian_3D.getCode() ) );
             packer.pack( Values.of( 3.15 ) );
             packer.pack( Values.of( 4.012 ) );
@@ -136,7 +136,7 @@ public void shouldFailWhenPoint3DDimensionsDoNotMatch() throws Exception
     {
         testFailureWithUnpackableValue( packer ->
         {
-            packer.packStructHeader( 4, KnownType.POINT_3D.signature() );
+            packer.packStructHeader( 4, StructType.POINT_3D.signature() );
             packer.pack( Values.of( CoordinateReferenceSystem.Cartesian.getCode() ) );
             packer.pack( Values.of( 3.15 ) );
             packer.pack( Values.of( 4.012 ) );
@@ -149,7 +149,7 @@ public void shouldFailWhenZonedDateTimeZoneIdIsNotKnown() throws Exception
     {
         testFailureWithUnpackableValue( packer ->
         {
-            packer.packStructHeader( 3, KnownType.DATE_TIME_WITH_ZONE_NAME.signature() );
+            packer.packStructHeader( 3, StructType.DATE_TIME_WITH_ZONE_NAME.signature() );
             packer.pack( Values.of( 0 ) );
             packer.pack( Values.of( 0 ) );
             packer.pack( Values.of( "Europe/Marmaris" ) );