More intuitive naming and javadocs

neo4j · Jan 23, 2017 · 73b780d · 73b780d
1 parent 8ef4abe
commit 73b780d
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 17 deletions.
diff --git a/.../main/java/org/neo4j/kernel/api/exceptions/schema/DuplicateEntitySchemaRuleException.java b/.../main/java/org/neo4j/kernel/api/exceptions/schema/DuplicateEntitySchemaRuleException.java
@@ -33,7 +33,7 @@ public DuplicateEntitySchemaRuleException( EntityPropertyDescriptor descriptor )
 
     public DuplicateEntitySchemaRuleException( EntityPropertyDescriptor descriptor, boolean unique )
     {
-        super( "Multiple %s found for " + descriptor.entityType().getTypeDescriptor() + " '%s' and property '%s'.",
+        super( "Multiple %s found for " + descriptor.entityType().getLabelingType() + " '%s' and property '%s'.",
                 descriptor, unique ? UNIQUE_CONSTRAINT_PREFIX : CONSTRAINT_PREFIX );
     }
 

diff --git a/...c/main/java/org/neo4j/kernel/api/exceptions/schema/EntitySchemaRuleNotFoundException.java b/...c/main/java/org/neo4j/kernel/api/exceptions/schema/EntitySchemaRuleNotFoundException.java
@@ -31,7 +31,7 @@ public EntitySchemaRuleNotFoundException( EntityPropertyDescriptor descriptor )
 
     public EntitySchemaRuleNotFoundException( EntityPropertyDescriptor descriptor, boolean unique )
     {
-        super( "%s for " + descriptor.entityType().getTypeDescriptor() + " '%s' and property '%s' not found.",
+        super( "%s for " + descriptor.entityType().getLabelingType() + " '%s' and property '%s' not found.",
                 descriptor,
                 unique ? UNIQUE_CONSTRAINT_PREFIX : CONSTRAINT_PREFIX );
     }

diff --git a/community/kernel/src/main/java/org/neo4j/kernel/api/schema/EntityPropertyDescriptor.java b/community/kernel/src/main/java/org/neo4j/kernel/api/schema/EntityPropertyDescriptor.java
@@ -93,7 +93,7 @@ public int[] getPropertyKeyIds()
     @Override
     public String toString()
     {
-        return format( ":%s[%d](property[%d])", entityType().getTypeDescriptor(), entityId, propertyKeyId );
+        return format( ":%s[%d](property[%d])", entityType().getLabelingType(), entityId, propertyKeyId );
     }
 
     public String propertyIdText()

diff --git a/community/kernel/src/main/java/org/neo4j/storageengine/api/EntityType.java b/community/kernel/src/main/java/org/neo4j/storageengine/api/EntityType.java
@@ -20,23 +20,28 @@
 package org.neo4j.storageengine.api;
 
 /**
- * Type of graph entity.
+ * Type of graph entity. The three types, Nodes, Relationships and Graphs, represent objects that can have properties
+ * associated with them, as well as labeled with additional type information. Nodes have labels, and relationships
+ * have relationship types. Graphs can have properties, but are not labeled.
  */
 public enum EntityType
 {
     NODE( "label" ),
     RELATIONSHIP( "relationship type" ),
-    GRAPH( "graph" );
+    GRAPH( "" );
 
-    private final String typeDescriptor;
+    private final String labelingType;
 
-    EntityType( String typeDescriptor )
+    EntityType( String labelingType )
     {
-        this.typeDescriptor = typeDescriptor;
+        this.labelingType = labelingType;
     }
 
-    public String getTypeDescriptor()
+    /**
+     * @return the name of the labeling type for this entity type
+     */
+    public String getLabelingType()
     {
-        return typeDescriptor;
+        return labelingType;
     }
 }
diff --git a/community/kernel/src/main/java/org/neo4j/unsafe/batchinsert/internal/BatchInserterImpl.java b/community/kernel/src/main/java/org/neo4j/unsafe/batchinsert/internal/BatchInserterImpl.java
@@ -1114,16 +1114,16 @@ private class BatchSchemaActions implements InternalSchemaActions
     {
         private int[] getOrCreatePropertyKeyIds( Iterable<String> properties )
         {
-            ArrayList<Integer> propertyKeyIds = new ArrayList<>();
+            return Iterables.stream( properties )
-            properties.forEach( index -> propertyKeyIds.add( getOrCreatePropertyKeyId( index ) ) );
+                    .mapToInt( BatchInserterImpl.this::getOrCreatePropertyKeyId )
-            return propertyKeyIds.stream().mapToInt( i -> i ).toArray();
+                    .toArray();
-
         }
 
-        private int[] getOrCreatePropertyKeyIds( String[] propertyKeys )
+        private int[] getOrCreatePropertyKeyIds( String[] properties )
         {
-            return getOrCreatePropertyKeyIds( Arrays.asList( propertyKeys ) );
+            return Arrays.stream( properties )
-
+                    .mapToInt( BatchInserterImpl.this::getOrCreatePropertyKeyId )
+                    .toArray();
         }
 
         @Override