Skip to content

Commit

Permalink
Value.asPublic for presenting values externally
Browse files Browse the repository at this point in the history
  • Loading branch information
@fickludd
fickludd committed May 31, 2017
1 parent 7c2e4d8 commit 7e59742
Show file tree
Hide file tree
Showing 45 changed files with 954 additions and 434 deletions.
8 changes: 4 additions & 4 deletions community/values/src/main/java/org/neo4j/values/DirectArray.java
View file
Expand Up @@ -19,24 +19,24 @@
*/
package org.neo4j.values;

abstract class DirectArray extends Value
abstract class DirectArray extends ValueImpl
{
abstract int length();

@Override
boolean equals( boolean x )
public boolean equals( boolean x )
{
return false;
}

@Override
boolean equals( char x )
public boolean equals( char x )
{
return false;
}

@Override
boolean equals( String x )
public boolean equals( String x )
{
return false;
}
Expand Down
14 changes: 10 additions & 4 deletions community/values/src/main/java/org/neo4j/values/DirectBoolean.java
View file
Expand Up @@ -47,19 +47,19 @@ public boolean equals( Value other )
}

@Override
boolean equals( boolean x )
public boolean equals( boolean x )
{
return bool == x;
}

@Override
boolean equals( char x )
public boolean equals( char x )
{
return false;
}

@Override
boolean equals( String x )
public boolean equals( String x )
{
return false;
}
Expand All @@ -83,11 +83,17 @@ public int compareTo( ValueGroup.VBoolean other )
}

@Override
void writeTo( ValueWriter writer )
public void writeTo( ValueWriter writer )
{
writer.writeBoolean( bool );
}

@Override
public Object asPublic()
{
return bool;
}

@Override
public String toString()
{
Expand Down
26 changes: 16 additions & 10 deletions community/values/src/main/java/org/neo4j/values/DirectBooleanArray.java
View file
Expand Up @@ -58,55 +58,55 @@ public boolean equals( Value other )
}

@Override
boolean equals( byte[] x )
public boolean equals( byte[] x )
{
return false;
}

@Override
boolean equals( short[] x )
public boolean equals( short[] x )
{
return false;
}

@Override
boolean equals( int[] x )
public boolean equals( int[] x )
{
return false;
}

@Override
boolean equals( long[] x )
public boolean equals( long[] x )
{
return false;
}

@Override
boolean equals( float[] x )
public boolean equals( float[] x )
{
return false;
}

@Override
boolean equals( double[] x )
public boolean equals( double[] x )
{
return false;
}

@Override
boolean equals( boolean[] x )
public boolean equals( boolean[] x )
{
return Arrays.equals( value, x );
}

@Override
boolean equals( char[] x )
public boolean equals( char[] x )
{
return false;
}

@Override
boolean equals( String[] x )
public boolean equals( String[] x )
{
return false;
}
Expand All @@ -118,11 +118,17 @@ public int hashCode()
}

@Override
void writeTo( ValueWriter writer )
public void writeTo( ValueWriter writer )
{
PrimitiveArrayWriting.writeTo( writer, value );
}

@Override
public Object asPublic()
{
return value.clone();
}

@Override
public String toString()
{
Expand Down
14 changes: 10 additions & 4 deletions community/values/src/main/java/org/neo4j/values/DirectByte.java
View file
Expand Up @@ -41,29 +41,35 @@ public long longValue()
}

@Override
boolean equals( boolean x )
public boolean equals( boolean x )
{
return false;
}

@Override
boolean equals( char x )
public boolean equals( char x )
{
return false;
}

@Override
boolean equals( String x )
public boolean equals( String x )
{
return false;
}

@Override
void writeTo( ValueWriter writer )
public void writeTo( ValueWriter writer )
{
writer.writeInteger( value );
}

@Override
public Object asPublic()
{
return value;
}

@Override
public String toString()
{
Expand Down
20 changes: 13 additions & 7 deletions community/values/src/main/java/org/neo4j/values/DirectByteArray.java
View file
Expand Up @@ -46,47 +46,53 @@ public long longValue( int index )
}

@Override
boolean equals( byte[] x )
public boolean equals( byte[] x )
{
return Arrays.equals( value, x );
}

@Override
boolean equals( short[] x )
public boolean equals( short[] x )
{
return PrimitiveArrayValues.equals( value, x );
}

@Override
boolean equals( int[] x )
public boolean equals( int[] x )
{
return PrimitiveArrayValues.equals( value, x );
}

@Override
boolean equals( long[] x )
public boolean equals( long[] x )
{
return PrimitiveArrayValues.equals( value, x );
}

@Override
boolean equals( float[] x )
public boolean equals( float[] x )
{
return PrimitiveArrayValues.equals( value, x );
}

@Override
boolean equals( double[] x )
public boolean equals( double[] x )
{
return PrimitiveArrayValues.equals( value, x );
}

@Override
void writeTo( ValueWriter writer )
public void writeTo( ValueWriter writer )
{
PrimitiveArrayWriting.writeTo( writer, value );
}

@Override
public Object asPublic()
{
return value.clone();
}

@Override
public String toString()
{
Expand Down
14 changes: 10 additions & 4 deletions community/values/src/main/java/org/neo4j/values/DirectChar.java
View file
Expand Up @@ -43,19 +43,19 @@ public boolean equals( Value other )
}

@Override
boolean equals( boolean x )
public boolean equals( boolean x )
{
return false;
}

@Override
boolean equals( char x )
public boolean equals( char x )
{
return value == x;
}

@Override
boolean equals( String x )
public boolean equals( String x )
{
return x.length() == 1 && x.charAt( 0 ) == value;
}
Expand All @@ -67,11 +67,17 @@ public int hashCode()
}

@Override
void writeTo( ValueWriter writer )
public void writeTo( ValueWriter writer )
{
writer.writeString( value );
}

@Override
public Object asPublic()
{
return value;
}

@Override
public String stringValue()
{
Expand Down
56 changes: 10 additions & 46 deletions community/values/src/main/java/org/neo4j/values/DirectCharArray.java
View file
Expand Up @@ -23,7 +23,7 @@

import static java.lang.String.format;

final class DirectCharArray extends DirectArray implements ValueGroup.VTextArray
final class DirectCharArray extends DirectTextArray
{
final char[] value;

Expand All @@ -45,48 +45,6 @@ public boolean equals( Value other )
return other.equals( value );
}

@Override
boolean equals( byte[] x )
{
return false;
}

@Override
boolean equals( short[] x )
{
return false;
}

@Override
boolean equals( int[] x )
{
return false;
}

@Override
boolean equals( long[] x )
{
return false;
}

@Override
boolean equals( float[] x )
{
return false;
}

@Override
boolean equals( double[] x )
{
return false;
}

@Override
boolean equals( boolean[] x )
{
return false;
}

// TODO: should we support this?
// @Override
// boolean equals( String x )
Expand All @@ -95,13 +53,13 @@ boolean equals( boolean[] x )
// }

@Override
boolean equals( char[] x )
public boolean equals( char[] x )
{
return Arrays.equals( value, x );
}

@Override
boolean equals( String[] x )
public boolean equals( String[] x )
{
return PrimitiveArrayValues.equals( value, x );
}
Expand Down Expand Up @@ -131,11 +89,17 @@ public String stringValue( int offset )
}

@Override
void writeTo( ValueWriter writer )
public void writeTo( ValueWriter writer )
{
PrimitiveArrayWriting.writeTo( writer, value );
}

@Override
public Object asPublic()
{
return value.clone();
}

@Override
public String toString()
{
Expand Down

0 comments on commit 7e59742

Please sign in to comment.