Simplify code by removing RelationshipItemHelper

neo4j · Feb 28, 2017 · fe263f5 · fe263f5
1 parent 2a0b420
commit fe263f5
Show file tree

Hide file tree

Showing 5 changed files with 68 additions and 101 deletions.
diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/cursor/RelationshipItemHelper.java b/community/kernel/src/main/java/org/neo4j/kernel/api/cursor/RelationshipItemHelper.java
diff --git a/...y/kernel/src/main/java/org/neo4j/kernel/impl/api/cursor/TxAbstractRelationshipCursor.java b/...y/kernel/src/main/java/org/neo4j/kernel/impl/api/cursor/TxAbstractRelationshipCursor.java
@@ -24,7 +24,6 @@
 import org.neo4j.cursor.Cursor;
 import org.neo4j.kernel.api.StatementConstants;
 import org.neo4j.kernel.api.cursor.EntityItemHelper;
-import org.neo4j.kernel.api.cursor.RelationshipItemHelper;
 import org.neo4j.kernel.api.txstate.TransactionState;
 import org.neo4j.kernel.impl.api.RelationshipVisitor;
 import org.neo4j.kernel.impl.util.Cursors;
@@ -35,8 +34,8 @@
 /**
  * Overlays transaction state on a {@link RelationshipItem} cursor.
  */
-public abstract class TxAbstractRelationshipCursor extends RelationshipItemHelper
-        implements Cursor<RelationshipItem>, RelationshipVisitor<RuntimeException>
+public abstract class TxAbstractRelationshipCursor extends EntityItemHelper
+        implements Cursor<RelationshipItem>, RelationshipVisitor<RuntimeException>, RelationshipItem
 {
     protected final TransactionState state;
     private final Consumer<TxAbstractRelationshipCursor> instanceCache;

diff --git a/...kernel/src/main/java/org/neo4j/kernel/impl/api/store/StoreAbstractRelationshipCursor.java b/...kernel/src/main/java/org/neo4j/kernel/impl/api/store/StoreAbstractRelationshipCursor.java
@@ -21,7 +21,6 @@
 
 import org.neo4j.cursor.Cursor;
 import org.neo4j.kernel.api.cursor.EntityItemHelper;
-import org.neo4j.kernel.api.cursor.RelationshipItemHelper;
 import org.neo4j.kernel.impl.locking.Lock;
 import org.neo4j.kernel.impl.locking.LockService;
 import org.neo4j.kernel.impl.store.RecordCursor;
@@ -38,7 +37,7 @@
 /**
  * Base cursor for relationships.
  */
-public abstract class StoreAbstractRelationshipCursor extends RelationshipItemHelper implements Cursor<RelationshipItem>
+public abstract class StoreAbstractRelationshipCursor extends EntityItemHelper implements Cursor<RelationshipItem>, RelationshipItem
 {
     protected final RelationshipRecord relationshipRecord;
     final RecordCursor<RelationshipRecord> relationshipRecordCursor;

diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/state/StubCursors.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/state/StubCursors.java
@@ -26,9 +26,10 @@
 import org.neo4j.collection.primitive.PrimitiveIntSet;
 import org.neo4j.cursor.Cursor;
 import org.neo4j.helpers.collection.Iterables;
-import org.neo4j.kernel.api.cursor.RelationshipItemHelper;
+import org.neo4j.kernel.api.cursor.EntityItemHelper;
 import org.neo4j.kernel.api.properties.DefinedProperty;
 import org.neo4j.kernel.impl.locking.Lock;
+import org.neo4j.kernel.impl.util.Cursors;
 import org.neo4j.storageengine.api.NodeItem;
 import org.neo4j.storageengine.api.PropertyItem;
 import org.neo4j.storageengine.api.RelationshipItem;
@@ -134,10 +135,71 @@ public boolean isDense()
         }
     }
 
+    private abstract static class TestRelationshipItem extends EntityItemHelper implements RelationshipItem
+    {
+
+    }
+
+    public static RelationshipItem relationship( long id, int type, long start, long end )
+    {
+        return new TestRelationshipItem()
+        {
+            @Override
+            public Cursor<PropertyItem> property( int propertyKeyId )
+            {
+                return Cursors.empty();
+            }
+
+            @Override
+            public Cursor<PropertyItem> properties()
+            {
+                return Cursors.empty();
+            }
+
+            @Override
+            public long id()
+            {
+                return id;
+            }
+
+            @Override
+            public int type()
+            {
+                return type;
+            }
+
+            @Override
+            public long startNode()
+            {
+                return start;
+            }
+
+            @Override
+            public long otherNode( long nodeId )
+            {
+                if ( nodeId == start )
+                {
+                    return end;
+                }
+                else if ( nodeId == end )
+                {
+                    return start;
+                }
+                throw new IllegalStateException();
+            }
+
+            @Override
+            public long endNode()
+            {
+                return end;
+            }
+        };
+    }
+
     public static Cursor<RelationshipItem> asRelationshipCursor( final long relId, final int type,
             final long startNode, final long endNode, final Cursor<PropertyItem> propertyCursor )
     {
-        return cursor( new RelationshipItemHelper()
+        return cursor( new TestRelationshipItem()
         {
             @Override
             public long id()

diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/state/TxStateTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/state/TxStateTest.java
@@ -40,7 +40,6 @@
 import org.neo4j.cursor.Cursor;
 import org.neo4j.helpers.collection.Iterables;
 import org.neo4j.helpers.collection.Pair;
-import org.neo4j.kernel.api.cursor.RelationshipItemHelper;
 import org.neo4j.kernel.api.properties.DefinedProperty;
 import org.neo4j.kernel.api.properties.Property;
 import org.neo4j.kernel.api.schema.NodePropertyDescriptor;
@@ -53,9 +52,7 @@
 import org.neo4j.kernel.api.txstate.TransactionState;
 import org.neo4j.kernel.impl.api.RelationshipVisitor;
 import org.neo4j.kernel.impl.api.store.RelationshipIterator;
-import org.neo4j.kernel.impl.util.Cursors;
 import org.neo4j.storageengine.api.Direction;
-import org.neo4j.storageengine.api.PropertyItem;
 import org.neo4j.storageengine.api.RelationshipItem;
 import org.neo4j.storageengine.api.txstate.ReadableDiffSets;
 import org.neo4j.storageengine.api.txstate.TxStateVisitor;
@@ -82,6 +79,7 @@
 import static org.neo4j.kernel.api.properties.Property.stringProperty;
 import static org.neo4j.kernel.api.schema_new.index.NewIndexDescriptor.Filter.GENERAL;
 import static org.neo4j.kernel.impl.api.state.StubCursors.cursor;
+import static org.neo4j.kernel.impl.api.state.StubCursors.relationship;
 
 public class TxStateTest
 {
@@ -1559,62 +1557,6 @@ private boolean contains( int[] array, int candidate )
         return false;
     }
 
-    private RelationshipItem relationship( long id, int type, long start, long end )
-    {
-        return new RelationshipItemHelper()
-        {
-            @Override
-            public Cursor<PropertyItem> property( int propertyKeyId )
-            {
-                return Cursors.empty();
-            }
-
-            @Override
-            public Cursor<PropertyItem> properties()
-            {
-                return Cursors.empty();
-            }
-
-            @Override
-            public long id()
-            {
-                return id;
-            }
-
-            @Override
-            public int type()
-            {
-                return type;
-            }
-
-            @Override
-            public long startNode()
-            {
-                return start;
-            }
-
-            @Override
-            public long otherNode( long nodeId )
-            {
-                if ( nodeId == start )
-                {
-                    return end;
-                }
-                else if ( nodeId == end )
-                {
-                    return start;
-                }
-                throw new IllegalStateException();
-            }
-
-            @Override
-            public long endNode()
-            {
-                return end;
-            }
-        };
-    }
-
     //endregion
 
     abstract class VisitationOrder extends TxStateVisitor.Adapter