Skip to content

Commit 93c26a1

Browse files
author
Zhen
committed
Fix compilation error on java 7
1 parent cc2fc61 commit 93c26a1

File tree

4 files changed

+16
-2
lines changed

4 files changed

+16
-2
lines changed

driver/src/main/java/org/neo4j/driver/internal/util/Extract.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,12 @@ public Property<V> next()
160160
Value value = map.value( key );
161161
return InternalProperty.of( key, mapFunction.apply( value ) );
162162
}
163+
164+
@Override
165+
public void remove()
166+
{
167+
keys.remove();
168+
}
163169
};
164170
}
165171
};

driver/src/main/java/org/neo4j/driver/internal/util/Iterables.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,12 @@ public B next()
7373
{
7474
return f.apply( aIterator.next() );
7575
}
76+
77+
@Override
78+
public void remove()
79+
{
80+
aIterator.remove();
81+
}
7682
};
7783
}
7884
};

driver/src/main/java/org/neo4j/driver/internal/value/BooleanValue.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@ public Type type()
4848
@Override
4949
public int hashCode()
5050
{
51-
return Boolean.hashCode( asBoolean() );
51+
Boolean value = asBoolean() ? Boolean.TRUE : Boolean.FALSE;
52+
return value.hashCode();
5253
}
5354

5455
private static class TrueValue extends BooleanValue {

driver/src/main/java/org/neo4j/driver/internal/value/MapValue.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,8 @@ public <T> Iterable<T> values( Function<Value, T> mapFunction )
107107
@Override
108108
public Value value( String key )
109109
{
110-
return val.getOrDefault( key, Values.NULL );
110+
Value value = val.get( key );
111+
return value == null ? Values.NULL: value;
111112
}
112113

113114
@Override

0 commit comments

Comments
 (0)