Skip to content

Commit

Permalink
Address review comments
Browse files Browse the repository at this point in the history
  • Loading branch information
@ali-ince
ali-ince committed Apr 5, 2018
1 parent 347540f commit a01b005
Show file tree
Hide file tree
Showing 13 changed files with 38 additions and 68 deletions.
18 changes: 9 additions & 9 deletions ...a/org/neo4j/bolt/messaging/KnownType.java → .../org/neo4j/bolt/messaging/StructType.java
View file
Expand Up @@ -27,7 +27,7 @@

import static java.util.Collections.unmodifiableMap;

public enum KnownType
public enum StructType
{
NODE( Neo4jPackV1.NODE, "Node" ),
RELATIONSHIP( Neo4jPackV1.RELATIONSHIP, "Relationship" ),
Expand All @@ -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;
Expand All @@ -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 );
}
Expand Down
5 changes: 0 additions & 5 deletions community/bolt/src/main/java/org/neo4j/bolt/transport/pipeline/MessageAccumulator.java
View file
Expand Up @@ -30,11 +30,6 @@ public class MessageAccumulator extends ByteToMessageDecoder
{
private boolean readMessageBoundary;

public MessageAccumulator()
{

}

@Override
public void channelRead( ChannelHandlerContext ctx, Object msg ) throws Exception
{
Expand Down
3 changes: 1 addition & 2 deletions community/bolt/src/main/java/org/neo4j/bolt/transport/pipeline/ProtocolHandshaker.java
View file
Expand Up @@ -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;
Expand Down Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions community/bolt/src/main/java/org/neo4j/bolt/v1/messaging/Neo4jPackV1.java
View file
Expand Up @@ -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;
Expand Down Expand Up @@ -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
Expand Down
6 changes: 0 additions & 6 deletions community/bolt/src/main/java/org/neo4j/bolt/v1/packstream/ByteBufInput.java
View file
Expand Up @@ -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 )
Expand Down
3 changes: 1 addition & 2 deletions community/bolt/src/main/java/org/neo4j/bolt/v1/packstream/PackInput.java
View file
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions community/bolt/src/main/java/org/neo4j/bolt/v1/packstream/PackStream.java
View file
Expand Up @@ -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;

/**
Expand Down Expand Up @@ -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 ) );
}
}
}
Expand Down
6 changes: 0 additions & 6 deletions community/bolt/src/main/java/org/neo4j/bolt/v1/packstream/PackedInputArray.java
View file
Expand Up @@ -81,10 +81,4 @@ public byte peekByte() throws IOException
data.reset();
return value;
}

@Override
public void close() throws IOException
{
data.close();
}
}
22 changes: 11 additions & 11 deletions community/bolt/src/main/java/org/neo4j/bolt/v2/messaging/Neo4jPackV2.java
View file
Expand Up @@ -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;
Expand Down Expand Up @@ -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 );
Expand All @@ -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,
Expand Down
11 changes: 0 additions & 11 deletions community/bolt/src/test/java/org/neo4j/bolt/v1/packstream/BufferedChannelInput.java
View file
Expand Up @@ -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 ) )
Expand Down
2 changes: 1 addition & 1 deletion ...ntegration/UnsupportedKnownTypesV1IT.java → ...tegration/UnsupportedStructTypesV1IT.java
View file
Expand Up @@ -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";

Expand Down
2 changes: 1 addition & 1 deletion ...egration/UnsupportedKnownTypesV1V2IT.java → ...gration/UnsupportedStructTypesV1V2IT.java
View file
Expand Up @@ -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";

Expand Down
14 changes: 7 additions & 7 deletions ...ntegration/UnsupportedKnownTypesV2IT.java → ...tegration/UnsupportedStructTypesV2IT.java
View file
Expand Up @@ -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;
Expand All @@ -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";

Expand Down Expand Up @@ -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 ) );
Expand All @@ -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 ) );
Expand All @@ -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 ) );
Expand All @@ -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 ) );
Expand All @@ -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" ) );
Expand Down

0 comments on commit a01b005

Please sign in to comment.