diff --git a/driver/src/main/java/org/neo4j/driver/Value.java b/driver/src/main/java/org/neo4j/driver/Value.java index 4d39c385f5..647af8f75d 100644 --- a/driver/src/main/java/org/neo4j/driver/Value.java +++ b/driver/src/main/java/org/neo4j/driver/Value.java @@ -28,7 +28,7 @@ * typeValue methods. The first set of these correlate with types from * the Neo4j Type System and are used to determine which Neo4j type is represented. * The second set of methods perform coercions to Java types (wherever possible). - * For example, a common Text value should be tested for using isText + * For example, a common String value should be tested for using isString * and extracted using stringValue. * *

Navigating a tree structure

@@ -166,8 +166,8 @@ public interface Value extends Iterable */ Iterable keys(); - /** @return true if the underlying value is a Neo4j text value */ - boolean isText(); + /** @return true if the underlying value is a Neo4j string value */ + boolean isString(); /** @return if the underlying value is a Neo4j 64-bit integer */ boolean isInteger(); diff --git a/driver/src/main/java/org/neo4j/driver/Values.java b/driver/src/main/java/org/neo4j/driver/Values.java index bfcdd34893..ab380ca115 100644 --- a/driver/src/main/java/org/neo4j/driver/Values.java +++ b/driver/src/main/java/org/neo4j/driver/Values.java @@ -36,7 +36,7 @@ import org.neo4j.driver.internal.value.NodeValue; import org.neo4j.driver.internal.value.PathValue; import org.neo4j.driver.internal.value.RelationshipValue; -import org.neo4j.driver.internal.value.TextValue; +import org.neo4j.driver.internal.value.StringValue; /** * Utility for wrapping regular Java types and exposing them as {@link org.neo4j.driver.Value} @@ -146,15 +146,15 @@ public static Value value( double[] val ) public static Value value( char[] val ) { - return new TextValue( new String( val ) ); + return new StringValue( new String( val ) ); } public static Value value( String[] val ) { - TextValue[] values = new TextValue[val.length]; + StringValue[] values = new StringValue[val.length]; for ( int i = 0; i < val.length; i++ ) { - values[i] = new TextValue( val[i] ); + values[i] = new StringValue( val[i] ); } return new ListValue( values ); } @@ -206,12 +206,12 @@ public static Value value( final boolean val ) public static Value value( final char val ) { - return new TextValue( Character.toString( val ) ); + return new StringValue( Character.toString( val ) ); } public static Value value( final String val ) { - return new TextValue( val ); + return new StringValue( val ); } public static Value value( final Map val ) diff --git a/driver/src/main/java/org/neo4j/driver/internal/messaging/PackStreamMessageFormatV1.java b/driver/src/main/java/org/neo4j/driver/internal/messaging/PackStreamMessageFormatV1.java index e898bfa2c6..b93c96a03d 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/messaging/PackStreamMessageFormatV1.java +++ b/driver/src/main/java/org/neo4j/driver/internal/messaging/PackStreamMessageFormatV1.java @@ -231,7 +231,7 @@ else if ( value.isFloat() ) { packer.pack( value.javaDouble() ); } - else if ( value.isText() ) + else if ( value.isString() ) { packer.pack( value.javaString() ); } @@ -501,7 +501,7 @@ private Value unpackValue() throws IOException return value( unpacker.unpackLong() ); case FLOAT: return value( unpacker.unpackDouble() ); - case TEXT: + case STRING: return value( unpacker.unpackString() ); case MAP: { diff --git a/driver/src/main/java/org/neo4j/driver/internal/packstream/PackStream.java b/driver/src/main/java/org/neo4j/driver/internal/packstream/PackStream.java index 29957420cb..4c0a1824fd 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/packstream/PackStream.java +++ b/driver/src/main/java/org/neo4j/driver/internal/packstream/PackStream.java @@ -25,8 +25,6 @@ import java.util.List; import java.util.Map; -import org.neo4j.driver.Value; - import static java.lang.Integer.toHexString; import static java.lang.String.format; import static java.util.Arrays.asList; @@ -44,7 +42,7 @@ * * * - * + * * * * @@ -61,9 +59,9 @@ * * * - * - * - * + * + * + * * * * @@ -85,7 +83,7 @@ public class PackStream { - public static final byte TINY_TEXT = (byte) 0x80; + public static final byte TINY_STRING = (byte) 0x80; public static final byte TINY_LIST = (byte) 0x90; public static final byte TINY_MAP = (byte) 0xA0; public static final byte TINY_STRUCT = (byte) 0xB0; @@ -105,9 +103,9 @@ public class PackStream public static final byte BYTES_16 = (byte) 0xCD; public static final byte BYTES_32 = (byte) 0xCE; public static final byte RESERVED_CF = (byte) 0xCF; - public static final byte TEXT_8 = (byte) 0xD0; - public static final byte TEXT_16 = (byte) 0xD1; - public static final byte TEXT_32 = (byte) 0xD2; + public static final byte STRING_8 = (byte) 0xD0; + public static final byte STRING_16 = (byte) 0xD1; + public static final byte STRING_32 = (byte) 0xD2; public static final byte RESERVED_D3 = (byte) 0xD3; public static final byte LIST_8 = (byte) 0xD4; public static final byte LIST_16 = (byte) 0xD5; @@ -242,17 +240,17 @@ public void pack( String value ) throws IOException else { byte[] utf8 = value.getBytes( UTF_8 ); - packTextHeader( utf8.length ); + packStringHeader( utf8.length ); packRaw( utf8 ); } } - public void packText( byte[] utf8 ) throws IOException + public void packString( byte[] utf8 ) throws IOException { if ( utf8 == null ) { packNull(); } else { - packTextHeader( utf8.length ); + packStringHeader( utf8.length ); packRaw( utf8 ); } } @@ -329,25 +327,25 @@ else if ( size <= Short.MAX_VALUE ) } } - public void packTextHeader( int size ) throws IOException + public void packStringHeader( int size ) throws IOException { if ( size < 0x10 ) { - out.writeByte( (byte) (TINY_TEXT | size) ); + out.writeByte( (byte) (TINY_STRING | size) ); } else if ( size <= Byte.MAX_VALUE ) { - out.writeByte( TEXT_8 ) + out.writeByte( STRING_8 ) .writeByte( (byte) size ); } else if ( size <= Short.MAX_VALUE ) { - out.writeByte( TEXT_16 ) + out.writeByte( STRING_16 ) .writeShort( (short) size ); } else { - out.writeByte( TEXT_32 ) + out.writeByte( STRING_32 ) .writeInt( size ); } } @@ -537,7 +535,7 @@ public double unpackDouble() throws IOException public String unpackString() throws IOException { final byte markerByte = in.readByte(); - if( markerByte == TINY_TEXT ) // Note no mask, so we compare to 0x80. + if( markerByte == TINY_STRING ) // Note no mask, so we compare to 0x80. { return EMPTY_STRING; } @@ -591,12 +589,12 @@ private byte[] unpackUtf8(byte markerByte) throws IOException final byte markerHighNibble = (byte) (markerByte & 0xF0); final byte markerLowNibble = (byte) (markerByte & 0x0F); - if ( markerHighNibble == TINY_TEXT ) { return unpackBytes( markerLowNibble ); } + if ( markerHighNibble == TINY_STRING ) { return unpackBytes( markerLowNibble ); } switch(markerByte) { - case TEXT_8: return unpackBytes( unpackUINT8() ); - case TEXT_16: return unpackBytes( unpackUINT16() ); - case TEXT_32: + case STRING_8: return unpackBytes( unpackUINT8() ); + case STRING_16: return unpackBytes( unpackUINT16() ); + case STRING_32: { long size = unpackUINT32(); if ( size <= Integer.MAX_VALUE ) @@ -605,7 +603,7 @@ private byte[] unpackUtf8(byte markerByte) throws IOException } else { - throw new Overflow( "TEXT_32 too long for Java" ); + throw new Overflow( "STRING_32 too long for Java" ); } } default: throw new Unexpected( "Expected a string, but got: 0x" + toHexString( markerByte & 0xFF )); @@ -655,7 +653,7 @@ public PackType peekNextType() throws IOException switch(markerHighNibble) { - case TINY_TEXT: return PackType.TEXT; + case TINY_STRING: return PackType.STRING; case TINY_LIST: return PackType.LIST; case TINY_MAP: return PackType.MAP; case TINY_STRUCT: return PackType.STRUCT; @@ -674,10 +672,10 @@ public PackType peekNextType() throws IOException case BYTES_16: case BYTES_32: return PackType.BYTES; - case TEXT_8: - case TEXT_16: - case TEXT_32: - return PackType.TEXT; + case STRING_8: + case STRING_16: + case STRING_32: + return PackType.STRING; case LIST_8: case LIST_16: case LIST_32: diff --git a/driver/src/main/java/org/neo4j/driver/internal/packstream/PackType.java b/driver/src/main/java/org/neo4j/driver/internal/packstream/PackType.java index 56432dafcc..37838f6ea5 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/packstream/PackType.java +++ b/driver/src/main/java/org/neo4j/driver/internal/packstream/PackType.java @@ -20,5 +20,6 @@ public enum PackType { - NULL, BOOLEAN, INTEGER, FLOAT, BYTES, TEXT, LIST, MAP, STRUCT + NULL, BOOLEAN, INTEGER, FLOAT, BYTES, + STRING, LIST, MAP, STRUCT } diff --git a/driver/src/main/java/org/neo4j/driver/internal/value/TextValue.java b/driver/src/main/java/org/neo4j/driver/internal/value/StringValue.java similarity index 90% rename from driver/src/main/java/org/neo4j/driver/internal/value/TextValue.java rename to driver/src/main/java/org/neo4j/driver/internal/value/StringValue.java index 4883a6b571..d0abcdbe6e 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/value/TextValue.java +++ b/driver/src/main/java/org/neo4j/driver/internal/value/StringValue.java @@ -18,11 +18,11 @@ */ package org.neo4j.driver.internal.value; -public class TextValue extends ValueAdapter +public class StringValue extends ValueAdapter { private final String val; - public TextValue( String val ) + public StringValue( String val ) { assert val != null; this.val = val; @@ -41,7 +41,7 @@ public String javaString() } @Override - public boolean isText() + public boolean isString() { return true; } @@ -70,7 +70,7 @@ public boolean equals( Object o ) return false; } - TextValue values = (TextValue) o; + StringValue values = (StringValue) o; return val.equals( values.val ); diff --git a/driver/src/main/java/org/neo4j/driver/internal/value/ValueAdapter.java b/driver/src/main/java/org/neo4j/driver/internal/value/ValueAdapter.java index 706857b054..fdba5dda1a 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/value/ValueAdapter.java +++ b/driver/src/main/java/org/neo4j/driver/internal/value/ValueAdapter.java @@ -133,7 +133,7 @@ public Iterable keys() } @Override - public boolean isText() + public boolean isString() { return false; } @@ -209,7 +209,7 @@ protected String typeName() if ( isFloat() ) { return "float"; } if ( isInteger() ) { return "integer"; } if ( isBoolean() ) { return "boolean"; } - if ( isText() ) { return "text"; } + if ( isString() ) { return "string"; } if ( isList() ) { return "list"; } if ( isMap() ) { return "map"; } if ( isIdentity() ) { return "identity"; } diff --git a/driver/src/test/java/org/neo4j/driver/integration/ParametersIT.java b/driver/src/test/java/org/neo4j/driver/integration/ParametersIT.java index 358609aef1..48daff89ac 100644 --- a/driver/src/test/java/org/neo4j/driver/integration/ParametersIT.java +++ b/driver/src/test/java/org/neo4j/driver/integration/ParametersIT.java @@ -152,7 +152,7 @@ public void shouldBeAbleToSetAndReturnCharacterProperty() for ( Record record : result.retain() ) { Value value = record.get( "a.value" ); - assertThat( value.isText(), equalTo( true ) ); + assertThat( value.isString(), equalTo( true ) ); assertThat( value.javaString(), equalTo( "ö" ) ); } @@ -170,7 +170,7 @@ public void shouldBeAbleToSetAndReturnCharacterArrayProperty() for ( Record record : result.retain() ) { Value value = record.get( "a.value" ); - assertThat( value.isText(), equalTo( true ) ); + assertThat( value.isString(), equalTo( true ) ); assertThat( value.javaString(), equalTo( "Mjölnir" ) ); } @@ -187,7 +187,7 @@ public void shouldBeAbleToSetAndReturnStringProperty() for ( Record record : result.retain() ) { Value value = record.get( "a.value" ); - assertThat( value.isText(), equalTo( true ) ); + assertThat( value.isString(), equalTo( true ) ); assertThat( value.javaString(), equalTo( "Mjölnir" ) ); } @@ -278,7 +278,7 @@ public void shouldBeAbleToSetAndReturnSpecialStringArrayProperty() assertThat( value.size(), equalTo( 3L ) ); for ( Value item : value ) { - assertThat( item.isText(), equalTo( true ) ); + assertThat( item.isString(), equalTo( true ) ); assertThat( item.javaString(), equalTo( "Mjölnir" ) ); } } @@ -300,7 +300,7 @@ public void shouldBeAbleToSetAndReturnStringArrayProperty() assertThat( value.size(), equalTo( 3L ) ); for ( Value item : value ) { - assertThat( item.isText(), equalTo( true ) ); + assertThat( item.isString(), equalTo( true ) ); assertThat( item.javaString(), equalTo( "cat" ) ); } } @@ -373,7 +373,7 @@ public void shouldBeAbleToSetAndReturnStringPropertyWithinMap() for ( Record record : result.retain() ) { Value value = record.get( "a.value" ); - assertThat( value.isText(), equalTo( true ) ); + assertThat( value.isString(), equalTo( true ) ); assertThat( value.javaString(), equalTo( "Mjölnir" ) ); } } diff --git a/driver/src/test/java/org/neo4j/driver/internal/ValuesTest.java b/driver/src/test/java/org/neo4j/driver/internal/ValuesTest.java index 1100e62001..b2f7cc0b4f 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/ValuesTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/ValuesTest.java @@ -29,25 +29,16 @@ import org.neo4j.driver.Value; import org.neo4j.driver.Values; import org.neo4j.driver.exceptions.ClientException; -import org.neo4j.driver.internal.value.BooleanValue; -import org.neo4j.driver.internal.value.FloatValue; -import org.neo4j.driver.internal.value.IntegerValue; import org.neo4j.driver.internal.value.ListValue; import org.neo4j.driver.internal.value.MapValue; -import org.neo4j.driver.internal.value.TextValue; +import org.neo4j.driver.internal.value.StringValue; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotEquals; import static org.neo4j.driver.Values.value; -import static org.neo4j.driver.Values.valueToBoolean; -import static org.neo4j.driver.Values.valueToDouble; -import static org.neo4j.driver.Values.valueToFloat; -import static org.neo4j.driver.Values.valueToInt; import static org.neo4j.driver.Values.valueToList; -import static org.neo4j.driver.Values.valueToLong; import static org.neo4j.driver.Values.valueToString; import static org.neo4j.driver.Values.values; @@ -66,7 +57,7 @@ public void shouldConvertPrimitiveArrays() throws Throwable equalTo( (Value) new ListValue( values( 1, 2, 3 ) ) ) ); assertThat( value( new char[]{'a', 'b', 'c'} ), - equalTo( (Value) new TextValue( "abc" ) ) ); + equalTo( (Value) new StringValue( "abc" ) ) ); assertThat( value( new long[]{1, 2, 3} ), equalTo( (Value) new ListValue( values( 1, 2, 3 ) ) ) ); diff --git a/driver/src/test/java/org/neo4j/driver/internal/packstream/PackStreamTest.java b/driver/src/test/java/org/neo4j/driver/internal/packstream/PackStreamTest.java index ecc4d5f9c3..b010f95e72 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/packstream/PackStreamTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/packstream/PackStreamTest.java @@ -360,7 +360,7 @@ public void testCanPackAndUnpackStrings() throws Throwable PackType packType = unpacker.peekNextType(); // Then - assertThat( packType, equalTo( PackType.TEXT ) ); + assertThat( packType, equalTo( PackType.STRING ) ); assertThat( unpacker.unpackString(), equalTo( string ) ); } @@ -388,7 +388,7 @@ public void testCanPackAndUnpackBytes() throws Throwable } @Test - public void testCanPackAndUnpackText() throws Throwable + public void testCanPackAndUnpackString() throws Throwable { // Given Machine machine = new Machine(); @@ -403,13 +403,13 @@ public void testCanPackAndUnpackText() throws Throwable PackType packType = unpacker.peekNextType(); // Then - assertThat( packType, equalTo( PackType.TEXT ) ); + assertThat( packType, equalTo( PackType.STRING ) ); assertThat( unpacker.unpackString(), equalTo( "ABCDEFGHIJ" )); } @Test - public void testCanPackAndUnpackSpecialText() throws Throwable + public void testCanPackAndUnpackSpecialString() throws Throwable { // Given Machine machine = new Machine(); @@ -425,19 +425,19 @@ public void testCanPackAndUnpackSpecialText() throws Throwable PackType packType = unpacker.peekNextType(); // Then - assertThat( packType, equalTo( PackType.TEXT ) ); + assertThat( packType, equalTo( PackType.STRING ) ); assertThat( unpacker.unpackString(), equalTo( code )); } @Test - public void testCanPackAndUnpackTextFromBytes() throws Throwable + public void testCanPackAndUnpackStringFromBytes() throws Throwable { // Given Machine machine = new Machine(); // When PackStream.Packer packer = machine.packer(); - packer.packText( "ABCDEFGHIJ".getBytes() ); + packer.packString( "ABCDEFGHIJ".getBytes() ); packer.flush(); // Then @@ -445,13 +445,13 @@ public void testCanPackAndUnpackTextFromBytes() throws Throwable PackType packType = unpacker.peekNextType(); // Then - assertThat( packType, equalTo( PackType.TEXT ) ); + assertThat( packType, equalTo( PackType.STRING ) ); assertThat( unpacker.unpackString(), equalTo( "ABCDEFGHIJ" )); } @Test - public void testCanPackAndUnpackSpecialTextFromBytes() throws Throwable + public void testCanPackAndUnpackSpecialStringFromBytes() throws Throwable { // Given Machine machine = new Machine(); @@ -464,7 +464,7 @@ public void testCanPackAndUnpackSpecialTextFromBytes() throws Throwable assertThat( BytePrinter.hex( bytes ).trim(), equalTo( "4d 6a c3 b6 6c 6e 69 72" ) ); assertThat( new String( bytes, UTF_8 ), equalTo( code ) ); - packer.packText( bytes ); + packer.packString( bytes ); packer.flush(); // Then @@ -472,7 +472,7 @@ public void testCanPackAndUnpackSpecialTextFromBytes() throws Throwable PackType packType = unpacker.peekNextType(); // Then - assertThat( packType, equalTo( PackType.TEXT ) ); + assertThat( packType, equalTo( PackType.STRING ) ); assertThat( unpacker.unpackString(), equalTo( code )); } @@ -503,7 +503,7 @@ public void testCanPackAndUnpackListOneItemAtATime() throws Throwable } @Test - public void testCanPackAndUnpackListOfText() throws Throwable + public void testCanPackAndUnpackListOfString() throws Throwable { // Given Machine machine = new Machine(); @@ -526,7 +526,7 @@ public void testCanPackAndUnpackListOfText() throws Throwable } @Test - public void testCanPackAndUnpackListOfSpecialText() throws Throwable + public void testCanPackAndUnpackListOfSpecialStrings() throws Throwable { // Given Machine machine = new Machine(); @@ -548,7 +548,7 @@ public void testCanPackAndUnpackListOfSpecialText() throws Throwable } @Test - public void testCanPackAndUnpackListOfTextOneByOne() throws Throwable + public void testCanPackAndUnpackListOfStringOneByOne() throws Throwable { // Given Machine machine = new Machine(); @@ -577,7 +577,7 @@ public void testCanPackAndUnpackListOfTextOneByOne() throws Throwable } @Test - public void testCanPackAndUnpackListOfSpecialTextOneByOne() throws Throwable + public void testCanPackAndUnpackListOfSpecialStringOneByOne() throws Throwable { // Given Machine machine = new Machine(); @@ -833,7 +833,7 @@ public void handlesDataCrossingBufferBoundaries() throws Throwable public void testCanPeekOnNextType() throws Throwable { // When & Then - assertPeekType( PackType.TEXT, "a string" ); + assertPeekType( PackType.STRING, "a string" ); assertPeekType( PackType.INTEGER, 123 ); assertPeekType( PackType.FLOAT, 123.123 ); assertPeekType( PackType.BOOLEAN, true ); @@ -854,4 +854,4 @@ void assertPeekType( PackType type, Object value ) throws IOException // When & Then assertEquals( type, unpacker.peekNextType() ); } -} \ No newline at end of file +} diff --git a/driver/src/test/java/org/neo4j/driver/internal/value/TextValueTest.java b/driver/src/test/java/org/neo4j/driver/internal/value/StringValueTest.java similarity index 74% rename from driver/src/test/java/org/neo4j/driver/internal/value/TextValueTest.java rename to driver/src/test/java/org/neo4j/driver/internal/value/StringValueTest.java index 1072cafcfd..ee7cb7f545 100644 --- a/driver/src/test/java/org/neo4j/driver/internal/value/TextValueTest.java +++ b/driver/src/test/java/org/neo4j/driver/internal/value/StringValueTest.java @@ -24,14 +24,14 @@ import static org.hamcrest.CoreMatchers.notNullValue; import static org.junit.Assert.assertThat; -public class TextValueTest +public class StringValueTest { @Test - public void testTextValue() throws Exception + public void testStringValue() throws Exception { // Given - TextValue value = new TextValue( "Spongebob" ); + StringValue value = new StringValue( "Spongebob" ); // Then assertThat( value.javaBoolean(), equalTo( true ) ); @@ -39,21 +39,21 @@ public void testTextValue() throws Exception } @Test - public void testIsText() throws Exception + public void testIsString() throws Exception { // Given - TextValue value = new TextValue( "Spongebob" ); + StringValue value = new StringValue( "Spongebob" ); // Then - assertThat( value.isText(), equalTo( true ) ); + assertThat( value.isString(), equalTo( true ) ); } @Test public void testEquals() throws Exception { // Given - TextValue firstValue = new TextValue( "Spongebob" ); - TextValue secondValue = new TextValue( "Spongebob" ); + StringValue firstValue = new StringValue( "Spongebob" ); + StringValue secondValue = new StringValue( "Spongebob" ); // Then assertThat( firstValue, equalTo( secondValue ) ); @@ -63,9 +63,9 @@ public void testEquals() throws Exception public void testHashCode() throws Exception { // Given - TextValue value = new TextValue( "Spongebob" ); + StringValue value = new StringValue( "Spongebob" ); // Then assertThat( value.hashCode(), notNullValue() ); } -} \ No newline at end of file +}
MarkerBinaryTypeDescription
00..7F0xxxxxxx+TINY_INTInteger 0 to 127
80..8F1000xxxxTINY_TEXT
80..8F1000xxxxTINY_STRING
90..9F1001xxxxTINY_LIST
A0..AF1010xxxxTINY_MAP
B0..BF1011xxxxTINY_STRUCT
CD11001101BYTES_16Byte string (fewer than 216 bytes)
CE11001110BYTES_32Byte string (fewer than 232 bytes)
CF11001111RESERVED
D011010000TEXT_8UTF-8 encoded text string (fewer than 28 bytes)
D111010001TEXT_16UTF-8 encoded text string (fewer than 216 bytes)
D211010010TEXT_32UTF-8 encoded text string (fewer than 232 bytes)
D011010000STRING_8UTF-8 encoded string (fewer than 28 bytes)
D111010001STRING_16UTF-8 encoded string (fewer than 216 bytes)
D211010010STRING_32UTF-8 encoded string (fewer than 232 bytes)
D311010011RESERVED
D411010100LIST_8List (fewer than 28 items)
D511010101LIST_16List (fewer than 216 items)