Move factory methods to interface

With Java 8 we can have static methods on interfaces, so there is no
need for DynamicLabel and DynamicRelationshipType. Instead we can move
the corresponding factory methods to the Label and RelationshipType
interfaces respectively.

community/bolt/src/main/java/org/neo4j/bolt/v1/messaging/infrastructure/ValueNode.java

@@ -28,7 +28,6 @@
 
 import org.neo4j.bolt.v1.messaging.BoltIOException;
 import org.neo4j.graphdb.Direction;
-import org.neo4j.graphdb.DynamicLabel;
 import org.neo4j.graphdb.GraphDatabaseService;
 import org.neo4j.graphdb.Label;
 import org.neo4j.graphdb.Node;
@@ -88,7 +87,7 @@ public static ValueNode unpackFields( Neo4jPack.Unpacker unpacker )
             labels = new ArrayList<>( numLabels );
             for ( int i = 0; i < numLabels; i++ )
             {
-                labels.add( DynamicLabel.label( unpacker.unpackString() ) );
+                labels.add( Label.label( unpacker.unpackString() ) );
             }
         }
         else

community/bolt/src/main/java/org/neo4j/bolt/v1/messaging/infrastructure/ValueRelationship.java

@@ -24,7 +24,6 @@
 
 import org.neo4j.bolt.v1.messaging.BoltIOException;
 import org.neo4j.bolt.v1.messaging.Neo4jPack;
-import org.neo4j.graphdb.DynamicRelationshipType;
 import org.neo4j.graphdb.GraphDatabaseService;
 import org.neo4j.graphdb.Node;
 import org.neo4j.graphdb.Relationship;
@@ -71,7 +70,7 @@ public static ValueRelationship unpackFields( Neo4jPack.Unpacker unpacker )
 
         Map<String, Object> props = unpacker.unpackMap();
 
-        RelationshipType relType = DynamicRelationshipType.withName( relTypeName );
+        RelationshipType relType = RelationshipType.withName( relTypeName );
 
         return new ValueRelationship( relId, startNodeId, endNodeId, relType, props );
     }

community/bolt/src/main/java/org/neo4j/bolt/v1/messaging/infrastructure/ValueUnboundRelationship.java

@@ -23,7 +23,6 @@
 import java.util.Map;
 
 import org.neo4j.bolt.v1.messaging.Neo4jPack;
-import org.neo4j.graphdb.DynamicRelationshipType;
 import org.neo4j.graphdb.GraphDatabaseService;
 import org.neo4j.graphdb.Node;
 import org.neo4j.graphdb.Relationship;
@@ -60,7 +59,7 @@ public static ValueUnboundRelationship unpackFields( Neo4jPack.Unpacker unpacker
 
         Map<String, Object> props = unpacker.unpackMap();
 
-        RelationshipType relType = DynamicRelationshipType.withName( relTypeName );
+        RelationshipType relType = RelationshipType.withName( relTypeName );
 
         return new ValueUnboundRelationship( relId, relType, props );
     }

community/bolt/src/test/java/org/neo4j/bolt/v1/docs/BoltValueDocTest.java

@@ -42,7 +42,7 @@
 import org.neo4j.bolt.v1.packstream.BufferedChannelOutput;
 import org.neo4j.bolt.v1.packstream.PackStream;
 import org.neo4j.bolt.v1.packstream.PackType;
-import org.neo4j.graphdb.DynamicRelationshipType;
+import org.neo4j.graphdb.RelationshipType;
 
 import static java.util.Arrays.asList;
 import static junit.framework.TestCase.fail;
@@ -51,7 +51,7 @@
 import static org.neo4j.bolt.v1.messaging.PackStreamMessageFormatV1.Writer.NO_OP;
 import static org.neo4j.bolt.v1.messaging.example.Paths.PATH_WITH_LENGTH_TWO;
 import static org.neo4j.bolt.v1.runtime.spi.Records.record;
-import static org.neo4j.graphdb.DynamicLabel.label;
+import static org.neo4j.graphdb.Label.label;
 import static org.neo4j.helpers.collection.MapUtil.map;
 
 /** This tests that Neo4j value mappings described in the documentation work the way we say they do. */
@@ -175,7 +175,7 @@ else if ( type.equalsIgnoreCase( "node" ) )
         }
         else if ( type.equalsIgnoreCase( "relationship" ) )
         {
-            return new ValueRelationship( 12, 1, 2, DynamicRelationshipType.withName( "KNOWS" ), map() );
+            return new ValueRelationship( 12, 1, 2, RelationshipType.withName( "KNOWS" ), map() );
         }
         else if ( type.equalsIgnoreCase( "path" ) )
         {

community/bolt/src/test/java/org/neo4j/bolt/v1/messaging/MessageFormatTest.java

@@ -26,8 +26,8 @@
 
 import org.junit.Test;
 
-import org.neo4j.graphdb.DynamicRelationshipType;
 import org.neo4j.graphdb.Path;
+import org.neo4j.graphdb.RelationshipType;
 import org.neo4j.kernel.api.exceptions.Status;
 import org.neo4j.kernel.impl.util.HexPrinter;
 import org.neo4j.bolt.v1.messaging.infrastructure.ValueNode;
@@ -50,7 +50,7 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
 
-import static org.neo4j.graphdb.DynamicLabel.label;
+import static org.neo4j.graphdb.Label.label;
 import static org.neo4j.helpers.collection.MapUtil.map;
 import static org.neo4j.bolt.v1.messaging.PackStreamMessageFormatV1.Writer.NO_OP;
 import static org.neo4j.bolt.v1.messaging.example.Paths.ALL_PATHS;
@@ -129,7 +129,7 @@ public void shouldSerializeNode() throws Throwable
     @Test
     public void shouldSerializeRelationship() throws Throwable
     {
-        assertSerializesNeoValue( new ValueRelationship( 12l, 1l, 2l, DynamicRelationshipType.withName( "KNOWS" ),
+        assertSerializesNeoValue( new ValueRelationship( 12l, 1l, 2l, RelationshipType.withName( "KNOWS" ),
                 map( "name", "Bob", "age", 14 ) ) );
     }
 

community/bolt/src/test/java/org/neo4j/bolt/v1/messaging/example/Nodes.java

@@ -26,7 +26,7 @@
 
 import static java.util.Arrays.asList;
 
-import static org.neo4j.graphdb.DynamicLabel.label;
+import static org.neo4j.graphdb.Label.label;
 import static org.neo4j.helpers.collection.MapUtil.map;
 import static org.neo4j.bolt.v1.messaging.example.Support.NO_LABELS;
 

community/bolt/src/test/java/org/neo4j/bolt/v1/messaging/example/Relationships.java

@@ -19,7 +19,6 @@
  */
 package org.neo4j.bolt.v1.messaging.example;
 
-import org.neo4j.graphdb.DynamicRelationshipType;
 import org.neo4j.graphdb.Relationship;
 import org.neo4j.graphdb.RelationshipType;
 import org.neo4j.bolt.v1.messaging.infrastructure.ValueRelationship;
@@ -34,13 +33,13 @@
 public class Relationships
 {
     // Relationship types
-    public static final RelationshipType KNOWS = DynamicRelationshipType.withName( "KNOWS" );
-    public static final RelationshipType LIKES = DynamicRelationshipType.withName( "LIKES" );
-    public static final RelationshipType DISLIKES = DynamicRelationshipType.withName( "DISLIKES" );
+    public static final RelationshipType KNOWS = RelationshipType.withName( "KNOWS" );
+    public static final RelationshipType LIKES = RelationshipType.withName( "LIKES" );
+    public static final RelationshipType DISLIKES = RelationshipType.withName( "DISLIKES" );
     public static final RelationshipType MARRIED_TO =
-            DynamicRelationshipType.withName( "MARRIED_TO" );
+            RelationshipType.withName( "MARRIED_TO" );
     public static final RelationshipType WORKS_FOR =
-            DynamicRelationshipType.withName( "WORKS_FOR" );
+            RelationshipType.withName( "WORKS_FOR" );
 
     // Relationships
     public static final Relationship ALICE_KNOWS_BOB =

community/consistency-check-legacy/src/test/java/org/neo4j/legacy/consistency/ConsistencyCheckServiceIntegrationTest.java

@@ -28,11 +28,10 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.neo4j.graphdb.DynamicLabel;
-import org.neo4j.graphdb.DynamicRelationshipType;
 import org.neo4j.graphdb.GraphDatabaseService;
 import org.neo4j.graphdb.Label;
 import org.neo4j.graphdb.Node;
+import org.neo4j.graphdb.RelationshipType;
 import org.neo4j.graphdb.Transaction;
 import org.neo4j.graphdb.factory.GraphDatabaseFactory;
 import org.neo4j.graphdb.factory.GraphDatabaseSettings;
@@ -129,7 +128,7 @@ public void shouldNotReportDuplicateForHugeLongValues() throws Exception
         GraphDatabaseService db = new TestGraphDatabaseFactory().newEmbeddedDatabase( testDirectory.graphDbDir() );
 
         String propertyKey = "itemId";
-        Label label = DynamicLabel.label( "Item" );
+        Label label = Label.label( "Item" );
         try ( Transaction tx = db.beginTx() )
         {
             db.schema().constraintFor( label ).assertPropertyIsUnique( propertyKey ).create();
@@ -207,7 +206,7 @@ protected void generateInitialData( GraphDatabaseService graphDb )
             {
                 Node node1 = set( graphDb.createNode() );
                 Node node2 = set( graphDb.createNode(), property( "key", "value" ) );
-                node1.createRelationshipTo( node2, DynamicRelationshipType.withName( "C" ) );
+                node1.createRelationshipTo( node2, RelationshipType.withName( "C" ) );
                 tx.success();
             }
         }

community/consistency-check-legacy/src/test/java/org/neo4j/legacy/consistency/ConsistencyCheckToolTest.java

@@ -61,7 +61,7 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyZeroInteractions;
 
-import static org.neo4j.graphdb.DynamicLabel.label;
+import static org.neo4j.graphdb.Label.label;
 import static org.neo4j.test.EphemeralFileSystemRule.shutdownDbAction;
 
 public class ConsistencyCheckToolTest

community/consistency-check-legacy/src/test/java/org/neo4j/legacy/consistency/checking/full/ExecutionOrderIntegrationTest.java

@@ -30,9 +30,9 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.neo4j.graphdb.DynamicRelationshipType;
 import org.neo4j.graphdb.GraphDatabaseService;
 import org.neo4j.graphdb.Node;
+import org.neo4j.graphdb.RelationshipType;
 import org.neo4j.graphdb.factory.GraphDatabaseSettings;
 import org.neo4j.helpers.progress.ProgressMonitorFactory;
 import org.neo4j.kernel.configuration.Config;
@@ -90,7 +90,7 @@ protected void generateInitialData( GraphDatabaseService graphDb )
             {
                 Node node1 = set( graphDb.createNode() );
                 Node node2 = set( graphDb.createNode(), property( "key", "value" ) );
-                node1.createRelationshipTo( node2, DynamicRelationshipType.withName( "C" ) );
+                node1.createRelationshipTo( node2, RelationshipType.withName( "C" ) );
                 tx.success();
             }
         }

community/consistency-check-legacy/src/test/java/org/neo4j/legacy/consistency/checking/full/FullCheckIntegrationTest.java

@@ -107,8 +107,8 @@
 import static java.util.Arrays.asList;
 import static java.util.Collections.singleton;
 
-import static org.neo4j.graphdb.DynamicLabel.label;
-import static org.neo4j.graphdb.DynamicRelationshipType.withName;
+import static org.neo4j.graphdb.Label.label;
+import static org.neo4j.graphdb.RelationshipType.withName;
 import static org.neo4j.helpers.collection.IteratorUtil.asIterable;
 import static org.neo4j.helpers.collection.IteratorUtil.iterator;
 import static org.neo4j.kernel.api.CountsRead.ANY_LABEL;

community/consistency-check/src/test/java/org/neo4j/consistency/ConsistencyCheckServiceIntegrationTest.java

@@ -31,11 +31,10 @@
 import org.neo4j.consistency.ConsistencyCheckService.Result;
 import org.neo4j.consistency.checking.GraphStoreFixture;
 import org.neo4j.consistency.checking.full.ConsistencyCheckIncompleteException;
-import org.neo4j.graphdb.DynamicLabel;
-import org.neo4j.graphdb.DynamicRelationshipType;
 import org.neo4j.graphdb.GraphDatabaseService;
 import org.neo4j.graphdb.Label;
 import org.neo4j.graphdb.Node;
+import org.neo4j.graphdb.RelationshipType;
 import org.neo4j.graphdb.Transaction;
 import org.neo4j.graphdb.factory.GraphDatabaseFactory;
 import org.neo4j.graphdb.factory.GraphDatabaseSettings;
@@ -123,7 +122,7 @@ public void shouldNotReportDuplicateForHugeLongValues() throws Exception
         GraphDatabaseService db = new TestGraphDatabaseFactory().newEmbeddedDatabase( testDirectory.graphDbDir() );
 
         String propertyKey = "itemId";
-        Label label = DynamicLabel.label( "Item" );
+        Label label = Label.label( "Item" );
         try ( Transaction tx = db.beginTx() )
         {
             db.schema().constraintFor( label ).assertPropertyIsUnique( propertyKey ).create();
@@ -206,7 +205,7 @@ protected void generateInitialData( GraphDatabaseService graphDb )
             {
                 Node node1 = set( graphDb.createNode() );
                 Node node2 = set( graphDb.createNode(), property( "key", "value" ) );
-                node1.createRelationshipTo( node2, DynamicRelationshipType.withName( "C" ) );
+                node1.createRelationshipTo( node2, RelationshipType.withName( "C" ) );
                 tx.success();
             }
         }

community/consistency-check/src/test/java/org/neo4j/consistency/ConsistencyCheckToolTest.java

@@ -67,7 +67,7 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyZeroInteractions;
 import static org.neo4j.consistency.ConsistencyCheckTool.USE_LEGACY_CHECKER;
-import static org.neo4j.graphdb.DynamicLabel.label;
+import static org.neo4j.graphdb.Label.label;
 import static org.neo4j.helpers.ArrayUtil.concat;
 import static org.neo4j.test.EphemeralFileSystemRule.shutdownDbAction;
 

community/consistency-check/src/test/java/org/neo4j/consistency/checking/full/ExecutionOrderIntegrationTest.java

@@ -49,9 +49,9 @@
 import org.neo4j.consistency.statistics.Statistics;
 import org.neo4j.consistency.store.RecordAccess;
 import org.neo4j.consistency.store.RecordReference;
-import org.neo4j.graphdb.DynamicRelationshipType;
 import org.neo4j.graphdb.GraphDatabaseService;
 import org.neo4j.graphdb.Node;
+import org.neo4j.graphdb.RelationshipType;
 import org.neo4j.graphdb.factory.GraphDatabaseSettings;
 import org.neo4j.helpers.progress.ProgressMonitorFactory;
 import org.neo4j.kernel.configuration.Config;
@@ -93,7 +93,7 @@ protected void generateInitialData( GraphDatabaseService graphDb )
             {
                 Node node1 = set( graphDb.createNode() );
                 Node node2 = set( graphDb.createNode(), property( "key", "value" ) );
-                node1.createRelationshipTo( node2, DynamicRelationshipType.withName( "C" ) );
+                node1.createRelationshipTo( node2, RelationshipType.withName( "C" ) );
                 tx.success();
             }
         }

community/consistency-check/src/test/java/org/neo4j/consistency/checking/full/FullCheckIntegrationTest.java

@@ -118,8 +118,8 @@
 import static org.neo4j.consistency.checking.full.ExecutionOrderIntegrationTest.config;
 import static org.neo4j.consistency.checking.full.FullCheckIntegrationTest.ConsistencySummaryVerifier.on;
 import static org.neo4j.consistency.checking.schema.IndexRules.loadAllIndexRules;
-import static org.neo4j.graphdb.DynamicLabel.label;
-import static org.neo4j.graphdb.DynamicRelationshipType.withName;
+import static org.neo4j.graphdb.Label.label;
+import static org.neo4j.graphdb.RelationshipType.withName;
 import static org.neo4j.helpers.collection.IteratorUtil.asIterable;
 import static org.neo4j.helpers.collection.IteratorUtil.iterator;
 import static org.neo4j.kernel.api.CountsRead.ANY_LABEL;

community/cypher/acceptance/src/test/scala/org/neo4j/internal/cypher/acceptance/CreateAcceptanceTest.scala

@@ -19,8 +19,8 @@
  */
 package org.neo4j.internal.cypher.acceptance
 
-import org.neo4j.cypher.{NewPlannerTestSupport, ExecutionEngineFunSuite, QueryStatisticsTestSupport, SyntaxException}
-import org.neo4j.graphdb.{DynamicRelationshipType, Direction, Node, Relationship}
+import org.neo4j.cypher.{ExecutionEngineFunSuite, NewPlannerTestSupport, QueryStatisticsTestSupport, SyntaxException}
+import org.neo4j.graphdb.{Direction, Relationship, RelationshipType}
 
 class CreateAcceptanceTest extends ExecutionEngineFunSuite with QueryStatisticsTestSupport with NewPlannerTestSupport {
 
@@ -141,8 +141,8 @@ class CreateAcceptanceTest extends ExecutionEngineFunSuite with QueryStatisticsT
 
     assertStats(result, relationshipsCreated = 1)
     graph.inTx {
-      start.getRelationships(DynamicRelationshipType.withName(typ), Direction.OUTGOING).asScala should have size 1
-      end.getRelationships(DynamicRelationshipType.withName(typ), Direction.INCOMING).asScala should have size 1
+      start.getRelationships(RelationshipType.withName(typ), Direction.OUTGOING).asScala should have size 1
+      end.getRelationships(RelationshipType.withName(typ), Direction.INCOMING).asScala should have size 1
     }
   }
 
@@ -155,7 +155,7 @@ class CreateAcceptanceTest extends ExecutionEngineFunSuite with QueryStatisticsT
 
     assertStats(result, nodesCreated = 1, labelsAdded = 1, relationshipsCreated = 1)
     graph.inTx {
-      start.getRelationships(DynamicRelationshipType.withName(typ), Direction.OUTGOING).asScala should have size 1
+      start.getRelationships(RelationshipType.withName(typ), Direction.OUTGOING).asScala should have size 1
     }
   }
 

community/cypher/acceptance/src/test/scala/org/neo4j/internal/cypher/acceptance/MatchAcceptanceTest.scala

@@ -1491,8 +1491,8 @@ return b
   test("MATCH (a1:X:Y)-[r]->() WITH r, a1 LIMIT 1 MATCH (a1:Y)-[r]->(b2) RETURN a1, r, b2") {
     val node1 = graph.inTx({
       val node = createNode()
-      node.addLabel(DynamicLabel.label("X"))
-      node.addLabel(DynamicLabel.label("Y"))
+      node.addLabel(Label.label("X"))
+      node.addLabel(Label.label("Y"))
       node
     })
     val node2 = createNode()

community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/ShortestPathExpression.scala

@@ -31,6 +31,7 @@ import org.neo4j.cypher.internal.frontend.v3_0.helpers.NonEmptyList
 import org.neo4j.cypher.internal.frontend.v3_0.symbols._
 import org.neo4j.graphalgo.GraphAlgoFactory
 import org.neo4j.graphalgo.impl.path.ShortestPath.ShortestPathPredicate
+import org.neo4j.graphdb.RelationshipType.withName
 import org.neo4j.graphdb._
 import org.neo4j.kernel.Traversal
 
@@ -136,7 +137,7 @@ case class ShortestPathExpression(shortestPathPattern: ShortestPath, predicates:
     Traversal.expanderForAllTypes(toGraphDb(shortestPathPattern.dir))
   } else {
     shortestPathPattern.relTypes.foldLeft(Traversal.emptyExpander()) {
-      case (e, t) => e.add(DynamicRelationshipType.withName(t), toGraphDb(shortestPathPattern.dir))
+      case (e, t) => e.add(withName(t), toGraphDb(shortestPathPattern.dir))
     }
   }
 

community/cypher/cypher-compiler-3.0/src/main/scala/org/neo4j/cypher/internal/compiler/v3_0/pipes/matching/SimplePatternMatcherBuilder.scala

@@ -22,13 +22,13 @@ package org.neo4j.cypher.internal.compiler.v3_0.pipes.matching
 import org.neo4j.cypher.internal.compiler.v3_0._
 import org.neo4j.cypher.internal.compiler.v3_0.ast.convert.commands.DirectionConverter._
 import org.neo4j.cypher.internal.compiler.v3_0.commands.predicates.Predicate
+import org.neo4j.cypher.internal.compiler.v3_0.pipes.QueryState
 import org.neo4j.cypher.internal.compiler.v3_0.symbols.SymbolTable
-import pipes.QueryState
-import org.neo4j.graphdb.{Relationship, Node, DynamicRelationshipType}
-import org.neo4j.graphmatching.{PatternMatcher => SimplePatternMatcher, PatternNode => SimplePatternNode,
-PatternRelationship => SimplePatternRelationship, PatternMatch}
-import collection.{immutable, Map}
-import collection.JavaConverters._
+import org.neo4j.graphdb.{Node, Relationship, RelationshipType}
+import org.neo4j.graphmatching.{PatternMatch, PatternMatcher => SimplePatternMatcher, PatternNode => SimplePatternNode, PatternRelationship => SimplePatternRelationship}
+
+import scala.collection.JavaConverters._
+import scala.collection.{Map, immutable}
 
 class SimplePatternMatcherBuilder(pattern: PatternGraph,
                                   predicates: Seq[Predicate],
@@ -53,7 +53,7 @@ class SimplePatternMatcherBuilder(pattern: PatternGraph,
       else {
         // The SimplePatternMatcher does not support multiple relationship types
         // re-visit this if it ever does
-        start.createRelationshipTo(end, DynamicRelationshipType.withName(pr.relTypes.head), toGraphDb(pr.dir))
+        start.createRelationshipTo(end, RelationshipType.withName(pr.relTypes.head), toGraphDb(pr.dir))
       }
 
       patternRel.setLabel(pr.key)

community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/PathImplTest.scala

@@ -31,7 +31,7 @@ import scala.collection.JavaConverters._
 
 class PathImplTest extends CypherFunSuite {
 
-  val typ = DynamicRelationshipType.withName("a")
+  val typ = RelationshipType.withName("a")
 
   test("singleNodeTests") {
     val node = new FakeNode

community/cypher/cypher-compiler-3.0/src/test/scala/org/neo4j/cypher/internal/compiler/v3_0/commands/expressions/PathValueBuilderTest.scala

@@ -21,7 +21,7 @@ package org.neo4j.cypher.internal.compiler.v3_0.commands.expressions
 
 import org.mockito.Mockito
 import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
-import org.neo4j.graphdb.{DynamicRelationshipType, Node, Relationship}
+import org.neo4j.graphdb.{Node, Relationship, RelationshipType}
 
 class PathValueBuilderTest extends CypherFunSuite {
 
@@ -245,7 +245,7 @@ class PathValueBuilderTest extends CypherFunSuite {
     Mockito.when(rel.getId).thenReturn(id)
     Mockito.when(rel.getStartNode).thenReturn(start)
     Mockito.when(rel.getEndNode).thenReturn(end)
-    Mockito.when(rel.getType).thenReturn(DynamicRelationshipType.withName("X"))
+    Mockito.when(rel.getType).thenReturn(RelationshipType.withName("X"))
     Mockito.when(rel.getOtherNode(start)).thenReturn(end)
     Mockito.when(rel.getOtherNode(end)).thenReturn(start)