Empty iterator and txState compilationFixes.

neo4j · May 25, 2017 · 682fbbf · 682fbbf
1 parent 14b9ba9
commit 682fbbf
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/...pher/src/main/scala/org/neo4j/cypher/internal/spi/v3_3/TransactionBoundQueryContext.scala b/...pher/src/main/scala/org/neo4j/cypher/internal/spi/v3_3/TransactionBoundQueryContext.scala
@@ -358,7 +358,7 @@ final class TransactionBoundQueryContext(val transactionalContext: Transactional
 
     override def isDeletedInThisTx(n: Node): Boolean = isDeletedInThisTx(n.getId)
 
-    def isDeletedInThisTx(id: Long): Boolean = transactionalContext.stateView.readableTxState().nodeIsDeletedInThisTx(id)
+    def isDeletedInThisTx(id: Long): Boolean = transactionalContext.stateView.txState().nodeIsDeletedInThisTx(id)
 
     override def acquireExclusiveLock(obj: Long) =
       transactionalContext.statement.readOperations().acquireExclusive(ResourceTypes.NODE, obj)
@@ -435,7 +435,7 @@ final class TransactionBoundQueryContext(val transactionalContext: Transactional
       isDeletedInThisTx(r.getId)
 
     def isDeletedInThisTx(id: Long): Boolean =
-      transactionalContext.stateView.readableTxState().relationshipIsDeletedInThisTx(id)
+      transactionalContext.stateView.txState().relationshipIsDeletedInThisTx(id)
 
     override def acquireExclusiveLock(obj: Long) =
       transactionalContext.statement.readOperations().acquireExclusive(ResourceTypes.RELATIONSHIP, obj)

diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/api/state/RelationshipStateImpl.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/api/state/RelationshipStateImpl.java
@@ -21,12 +21,13 @@
 
 import java.util.Iterator;
 
-import org.neo4j.helpers.collection.Iterators;
 import org.neo4j.kernel.api.exceptions.schema.ConstraintValidationException;
 import org.neo4j.kernel.impl.api.RelationshipVisitor;
 import org.neo4j.storageengine.api.StorageProperty;
 import org.neo4j.storageengine.api.txstate.RelationshipState;
 
+import static java.util.Collections.emptyIterator;
+
 public class RelationshipStateImpl extends PropertyContainerStateImpl implements RelationshipState
 {
     private long startNode = -1;
@@ -92,25 +93,25 @@ public <EX extends Exception> boolean accept( RelationshipVisitor<EX> visitor )
             @Override
             public Iterator<StorageProperty> addedProperties()
             {
-                return Iterators.emptyIterator();
+                return emptyIterator();
             }
 
             @Override
             public Iterator<StorageProperty> changedProperties()
             {
-                return Iterators.emptyIterator();
+                return emptyIterator();
             }
 
             @Override
             public Iterator<Integer> removedProperties()
             {
-                return Iterators.emptyIterator();
+                return emptyIterator();
             }
 
             @Override
             public Iterator<StorageProperty> addedAndChangedProperties()
             {
-                return Iterators.emptyIterator();
+                return emptyIterator();
             }
 
             @Override

diff --git a/...rver/src/test/java/org/neo4j/server/rest/transactional/ExecutionResultSerializerTest.java b/...rver/src/test/java/org/neo4j/server/rest/transactional/ExecutionResultSerializerTest.java
@@ -22,6 +22,8 @@
 import org.codehaus.jackson.JsonNode;
 import org.junit.Test;
 import org.mockito.internal.stubbing.answers.ThrowsException;
+import org.mockito.invocation.InvocationOnMock;
+import org.mockito.stubbing.Answer;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;