Fixed inheritance issues with AbstractSchemaRule and couple minor cle…

…anups

community/kernel/src/main/java/org/neo4j/graphdb/schema/ConstraintDefinition.java

@@ -31,7 +31,7 @@
 public interface ConstraintDefinition
 {
     /**
-     * This accessor method returns a label which this constraint is associated with iff this constraint has type
+     * This accessor method returns a label which this constraint is associated with if this constraint has type
      * {@link ConstraintType#UNIQUENESS} or {@link ConstraintType#MANDATORY_NODE_PROPERTY}.
      * Type of the constraint can be examined by calling {@link #getConstraintType()} or
      * {@link #isConstraintType(ConstraintType)} methods.
@@ -42,7 +42,7 @@ public interface ConstraintDefinition
     Label getLabel();
 
     /**
-     * This accessor method returns a relationship type which this constraint is associated with iff this constraint
+     * This accessor method returns a relationship type which this constraint is associated with if this constraint
      * has type {@link ConstraintType#UNIQUENESS} or {@link ConstraintType#MANDATORY_NODE_PROPERTY}.
      * Type of the constraint can be examined by calling {@link #getConstraintType()} or
      * {@link #isConstraintType(ConstraintType)} methods.

community/kernel/src/main/java/org/neo4j/kernel/impl/api/ConstraintEnforcingEntityOperations.java

@@ -24,6 +24,7 @@
 import org.neo4j.collection.primitive.PrimitiveIntIterator;
 import org.neo4j.collection.primitive.PrimitiveLongIterator;
 import org.neo4j.function.Predicate;
+import org.neo4j.function.Predicates;
 import org.neo4j.graphdb.Direction;
 import org.neo4j.helpers.collection.FilteringIterator;
 import org.neo4j.kernel.api.constraints.MandatoryNodePropertyConstraint;
@@ -66,6 +67,9 @@
 
 public class ConstraintEnforcingEntityOperations implements EntityOperations, SchemaWriteOperations
 {
+    private static final Predicate<NodePropertyConstraint> UNIQUENESS_CONSTRAINT =
+            Predicates.instanceOf( UniquenessConstraint.class );
+
     private final EntityWriteOperations entityWriteOperations;
     private final EntityReadOperations entityReadOperations;
     private final SchemaWriteOperations schemaWriteOperations;
@@ -162,14 +166,7 @@ private void assertIndexOnline( KernelStatement state, IndexDescriptor indexDesc
 
     private Iterator<NodePropertyConstraint> uniquePropertyConstraints( Iterator<NodePropertyConstraint> constraints )
     {
-        return new FilteringIterator<>( constraints, new Predicate<NodePropertyConstraint>()
-        {
-            @Override
-            public boolean test( NodePropertyConstraint constraint )
-            {
-                return constraint instanceof UniquenessConstraint;
-            }
-        } );
+        return new FilteringIterator<>( constraints, UNIQUENESS_CONSTRAINT );
     }
 
     // Simply delegate the rest of the invocations

community/kernel/src/main/java/org/neo4j/kernel/impl/api/MandatoryPropertyEnforcer.java

@@ -25,6 +25,7 @@
 
 import org.neo4j.collection.primitive.PrimitiveIntIterator;
 import org.neo4j.function.Predicate;
+import org.neo4j.function.Predicates;
 import org.neo4j.helpers.collection.FilteringIterator;
 import org.neo4j.kernel.api.constraints.MandatoryNodePropertyConstraint;
 import org.neo4j.kernel.api.constraints.MandatoryRelationshipPropertyConstraint;
@@ -45,6 +46,12 @@
 
 public class MandatoryPropertyEnforcer extends TxStateVisitor.Adapter
 {
+    private static final Predicate<NodePropertyConstraint> MANDATORY_NODE_PROPERTY_CONSTRAINT =
+            Predicates.instanceOf( MandatoryNodePropertyConstraint.class );
+
+    private static final Predicate<RelationshipPropertyConstraint> MANDATORY_RELATIONSHIP_PROPERTY_CONSTRAINT =
+            Predicates.instanceOf( MandatoryRelationshipPropertyConstraint.class );
+
     private final EntityReadOperations readOperations;
     private final StoreReadLayer storeLayer;
     private final StoreStatement storeStatement;
@@ -176,26 +183,12 @@ private PrimitiveIntIterator labelsOf( long nodeId )
     private Iterator<NodePropertyConstraint> mandatoryNodePropertyConstraints( int label )
     {
         return new FilteringIterator<>( storeLayer.constraintsGetForLabel( label ),
-                new Predicate<NodePropertyConstraint>()
-                {
-                    @Override
-                    public boolean test( NodePropertyConstraint constraint )
-                    {
-                        return constraint instanceof MandatoryNodePropertyConstraint;
-                    }
-                } );
+                MANDATORY_NODE_PROPERTY_CONSTRAINT );
     }
 
     private Iterator<RelationshipPropertyConstraint> mandatoryRelPropertyConstraints( int type )
     {
         return new FilteringIterator<>( storeLayer.constraintsGetForRelationshipType( type ),
-                new Predicate<RelationshipPropertyConstraint>()
-                {
-                    @Override
-                    public boolean test( RelationshipPropertyConstraint constraint )
-                    {
-                        return constraint instanceof MandatoryRelationshipPropertyConstraint;
-                    }
-                } );
+                MANDATORY_RELATIONSHIP_PROPERTY_CONSTRAINT );
     }
 }

community/kernel/src/main/java/org/neo4j/kernel/impl/store/MandatoryNodePropertyConstraintRule.java

@@ -29,12 +29,14 @@ public class MandatoryNodePropertyConstraintRule extends NodePropertyConstraintR
 {
     private final int propertyKeyId;
 
-    public static MandatoryNodePropertyConstraintRule mandatoryNodePropertyConstraintRule( long id, int labelId, int propertyKeyId )
+    public static MandatoryNodePropertyConstraintRule mandatoryNodePropertyConstraintRule( long id, int labelId,
+            int propertyKeyId )
     {
         return new MandatoryNodePropertyConstraintRule( id, labelId, propertyKeyId );
     }
 
-    public static MandatoryNodePropertyConstraintRule readMandatoryNodePropertyConstraintRule( long id, int labelId, ByteBuffer buffer )
+    public static MandatoryNodePropertyConstraintRule readMandatoryNodePropertyConstraintRule( long id, int labelId,
+            ByteBuffer buffer )
     {
         return new MandatoryNodePropertyConstraintRule( id, labelId, readPropertyKey( buffer ) );
     }
@@ -46,34 +48,25 @@ private MandatoryNodePropertyConstraintRule( long id, int labelId, int propertyK
     }
 
     @Override
-    public int hashCode()
-    {
-        return super.hashCode() | propertyKeyId;
-    }
-
-    @Override
-    public boolean equals( Object obj )
+    public String toString()
     {
-        return super.equals( obj ) && propertyKeyId == ((MandatoryNodePropertyConstraintRule) obj).propertyKeyId;
-    }
-
-    @Override
-    protected String innerToString()
-    {
-        return ", propertyKey=" + propertyKeyId;
+        return "MandatoryNodePropertyConstraintRule[id=" + id + ", label=" + label + ", kind=" + kind +
+               ", propertyKeyId=" + propertyKeyId + "]";
     }
 
     @Override
     public int length()
     {
-        return super.length() +
-               4; /* propertyKeyId */
+        return 4 /* label id */ +
+               1 /* kind id */ +
+               4; /* property key id */
     }
 
     @Override
     public void serialize( ByteBuffer target )
     {
-        super.serialize( target );
+        target.putInt( label );
+        target.put( kind.id() );
         target.putInt( propertyKeyId );
     }
 
@@ -98,4 +91,29 @@ public boolean containsPropertyKeyId( int propertyKeyId )
     {
         return propertyKeyId == this.propertyKeyId;
     }
+
+    @Override
+    public boolean equals( Object o )
+    {
+        if ( this == o )
+        {
+            return true;
+        }
+        if ( o == null || getClass() != o.getClass() )
+        {
+            return false;
+        }
+        if ( !super.equals( o ) )
+        {
+            return false;
+        }
+        return propertyKeyId == ((MandatoryNodePropertyConstraintRule) o).propertyKeyId;
+
+    }
+
+    @Override
+    public int hashCode()
+    {
+        return 31 * super.hashCode() + propertyKeyId;
+    }
 }

community/kernel/src/main/java/org/neo4j/kernel/impl/store/MandatoryRelationshipPropertyConstraintRule.java

@@ -28,12 +28,14 @@ public class MandatoryRelationshipPropertyConstraintRule extends RelationshipPro
 {
     private final int propertyKeyId;
 
-    public static MandatoryRelationshipPropertyConstraintRule mandatoryRelPropertyConstraintRule( long id, int relTypeId, int propertyKeyId )
+    public static MandatoryRelationshipPropertyConstraintRule mandatoryRelPropertyConstraintRule( long id,
+            int relTypeId, int propertyKeyId )
     {
         return new MandatoryRelationshipPropertyConstraintRule( id, relTypeId, propertyKeyId );
     }
 
-    public static MandatoryRelationshipPropertyConstraintRule readMandatoryRelPropertyConstraintRule( long id, int relTypeId, ByteBuffer buffer )
+    public static MandatoryRelationshipPropertyConstraintRule readMandatoryRelPropertyConstraintRule( long id,
+            int relTypeId, ByteBuffer buffer )
     {
         return new MandatoryRelationshipPropertyConstraintRule( id, relTypeId, readPropertyKey( buffer ) );
     }
@@ -45,34 +47,25 @@ private MandatoryRelationshipPropertyConstraintRule( long id, int relTypeId, int
     }
 
     @Override
-    public int hashCode()
-    {
-        return super.hashCode() | propertyKeyId;
-    }
-
-    @Override
-    public boolean equals( Object obj )
-    {
-        return super.equals( obj ) && propertyKeyId == ((MandatoryRelationshipPropertyConstraintRule) obj).propertyKeyId;
-    }
-
-    @Override
-    protected String innerToString()
+    public String toString()
     {
-        return ", propertyKey=" + propertyKeyId;
+        return "MandatoryRelationshipPropertyConstraint" + id + ", relationshipType=" + relationshipType +
+               ", kind=" + kind + ", propertyKeyId=" + propertyKeyId + "]";
     }
 
     @Override
     public int length()
     {
-        return super.length() +
-               4; /* propertyKeyId */
+        return 4 /* relationship type id */ +
+               1 /* kind id */ +
+               4; /* property key id */
     }
 
     @Override
     public void serialize( ByteBuffer target )
     {
-        super.serialize( target );
+        target.putInt( relationshipType );
+        target.put( kind.id() );
         target.putInt( propertyKeyId );
     }
 
@@ -97,4 +90,28 @@ public boolean containsPropertyKeyId( int propertyKeyId )
     {
         return propertyKeyId == this.propertyKeyId;
     }
+
+    @Override
+    public boolean equals( Object o )
+    {
+        if ( this == o )
+        {
+            return true;
+        }
+        if ( o == null || getClass() != o.getClass() )
+        {
+            return false;
+        }
+        if ( !super.equals( o ) )
+        {
+            return false;
+        }
+        return propertyKeyId == ((MandatoryRelationshipPropertyConstraintRule) o).propertyKeyId;
+    }
+
+    @Override
+    public int hashCode()
+    {
+        return 31 * super.hashCode() + propertyKeyId;
+    }
 }

community/kernel/src/main/java/org/neo4j/kernel/impl/store/NodePropertyConstraintRule.java

@@ -23,15 +23,18 @@
 
 public abstract class NodePropertyConstraintRule extends PropertyConstraintRule
 {
+    protected final int label;
+
     public NodePropertyConstraintRule( long id, int label, Kind kind )
     {
-        super( id, label, NOT_INITIALIZED, kind );
+        super( id, kind );
+        this.label = label;
     }
 
     @Override
     public final int getLabel()
     {
-        return getLabelOrRelationshipType();
+        return label;
     }
 
     @Override
@@ -42,4 +45,29 @@ public final int getRelationshipType()
 
     @Override
     public abstract NodePropertyConstraint toConstraint();
+
+    @Override
+    public boolean equals( Object o )
+    {
+        if ( this == o )
+        {
+            return true;
+        }
+        if ( o == null || getClass() != o.getClass() )
+        {
+            return false;
+        }
+        if ( !super.equals( o ) )
+        {
+            return false;
+        }
+        return label == ((NodePropertyConstraintRule) o).label;
+
+    }
+
+    @Override
+    public int hashCode()
+    {
+        return 31 * super.hashCode() + label;
+    }
 }

community/kernel/src/main/java/org/neo4j/kernel/impl/store/PropertyConstraintRule.java

@@ -25,9 +25,9 @@
 
 public abstract class PropertyConstraintRule extends AbstractSchemaRule
 {
-    PropertyConstraintRule( long id, int label, int relationshipType, Kind kind )
+    PropertyConstraintRule( long id, Kind kind )
     {
-        super( id, label, relationshipType, kind );
+        super( id, kind );
     }
 
     public abstract PropertyConstraint toConstraint();

community/kernel/src/main/java/org/neo4j/kernel/impl/store/RelationshipPropertyConstraintRule.java

@@ -23,9 +23,12 @@
 
 public abstract class RelationshipPropertyConstraintRule extends PropertyConstraintRule
 {
+    protected final int relationshipType;
+
     public RelationshipPropertyConstraintRule( long id, int relationshipType, Kind kind )
     {
-        super( id, NOT_INITIALIZED, relationshipType, kind );
+        super( id, kind );
+        this.relationshipType = relationshipType;
     }
 
     @Override
@@ -37,9 +40,33 @@ public final int getLabel()
     @Override
     public final int getRelationshipType()
     {
-        return getLabelOrRelationshipType();
+        return relationshipType;
     }
 
     @Override
     public abstract RelationshipPropertyConstraint toConstraint();
+
+    @Override
+    public boolean equals( Object o )
+    {
+        if ( this == o )
+        {
+            return true;
+        }
+        if ( o == null || getClass() != o.getClass() )
+        {
+            return false;
+        }
+        if ( !super.equals( o ) )
+        {
+            return false;
+        }
+        return relationshipType == ((RelationshipPropertyConstraintRule) o).relationshipType;
+    }
+
+    @Override
+    public int hashCode()
+    {
+        return 31 * super.hashCode() + relationshipType;
+    }
 }