Fix the manual

neo4j · Feb 16, 2016 · 79d1a76 · 79d1a76
1 parent 2e4fdbe
commit 79d1a76
Show file tree

Hide file tree

Showing 12 changed files with 59 additions and 64 deletions.
diff --git a/...cypher/cypher-docs/src/test/java/org/neo4j/cypher/example/JavaExecutionEngineDocTest.java b/...cypher/cypher-docs/src/test/java/org/neo4j/cypher/example/JavaExecutionEngineDocTest.java
@@ -19,15 +19,6 @@
  */
 package org.neo4j.cypher.example;
 
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
 import org.codehaus.jackson.JsonGenerationException;
 import org.codehaus.jackson.map.JsonMappingException;
 import org.codehaus.jackson.map.ObjectMapper;
@@ -37,6 +28,15 @@
 import org.junit.BeforeClass;
 import org.junit.Test;
 
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
 import org.neo4j.graphdb.GraphDatabaseService;
 import org.neo4j.graphdb.Node;
 import org.neo4j.graphdb.RelationshipType;
@@ -50,16 +50,14 @@
 import org.neo4j.visualization.asciidoc.AsciidocHelper;
 
 import static java.util.Arrays.asList;
-
 import static org.hamcrest.CoreMatchers.hasItem;
 import static org.hamcrest.CoreMatchers.hasItems;
 import static org.hamcrest.CoreMatchers.instanceOf;
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.fail;
-
-import static org.neo4j.cypher.javacompat.RegularExpressionMatcher.matchesPattern;
+import static org.neo4j.cypher.internal.javacompat.RegularExpressionMatcher.matchesPattern;
 import static org.neo4j.helpers.collection.IteratorUtil.asIterable;
 import static org.neo4j.helpers.collection.IteratorUtil.count;
 

diff --git a/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/ArticleTest.scala b/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/ArticleTest.scala
@@ -19,24 +19,24 @@
  */
 package org.neo4j.cypher.docgen
 
-import org.neo4j.cypher.internal.RewindableExecutionResult
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.InternalExecutionResult
-import org.neo4j.graphdb.index.Index
+import java.io.{File, PrintWriter, StringWriter}
+
 import org.junit.Test
-import scala.collection.JavaConverters._
-import java.io.{StringWriter, File, PrintWriter}
+import org.neo4j.cypher._
+import org.neo4j.cypher.export.{DatabaseSubGraph, SubGraphExporter}
+import org.neo4j.cypher.internal.compiler.v3_0.executionplan.InternalExecutionResult
+import org.neo4j.cypher.internal.compiler.v3_0.prettifier.Prettifier
+import org.neo4j.cypher.internal.javacompat.GraphImpl
+import org.neo4j.cypher.internal.{ExecutionEngine, RewindableExecutionResult}
 import org.neo4j.graphdb._
+import org.neo4j.graphdb.index.Index
+import org.neo4j.kernel.GraphDatabaseAPI
+import org.neo4j.test.GraphDatabaseServiceCleaner.cleanDatabaseContent
+import org.neo4j.test.{AsciiDocGenerator, GraphDescription, TestGraphDatabaseFactory}
 import org.neo4j.visualization.asciidoc.AsciidocHelper
-import org.neo4j.cypher.javacompat.GraphImpl
-import org.neo4j.cypher._
-import export.{DatabaseSubGraph, SubGraphExporter}
-import org.neo4j.test.{ImpermanentGraphDatabase, TestGraphDatabaseFactory, GraphDescription}
 import org.scalatest.Assertions
-import org.neo4j.test.AsciiDocGenerator
-import org.neo4j.test.GraphDatabaseServiceCleaner.cleanDatabaseContent
-import org.neo4j.kernel.GraphDatabaseAPI
-import org.neo4j.tooling.GlobalGraphOperations
-import org.neo4j.cypher.internal.compiler.v3_0.prettifier.Prettifier
+
+import scala.collection.JavaConverters._
 
 /*
 Use this base class for tests that are more flowing text with queries intersected in the middle of the text.

diff --git a/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/DocumentingTestBase.scala b/manual/cypher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/DocumentingTestBase.scala
@@ -29,22 +29,21 @@ import org.neo4j.cypher.example.JavaExecutionEngineDocTest
 import org.neo4j.cypher.export.{DatabaseSubGraph, SubGraphExporter}
 import org.neo4j.cypher.internal.compiler.v3_0.executionplan.InternalExecutionResult
 import org.neo4j.cypher.internal.compiler.v3_0.prettifier.Prettifier
-import org.neo4j.cypher.internal.helpers.GraphIcing
 import org.neo4j.cypher.internal.frontend.v3_0.helpers.Eagerly
-import org.neo4j.cypher.internal.{RewindableExecutionResult, ServerExecutionEngine}
-import org.neo4j.cypher.javacompat.GraphImpl
+import org.neo4j.cypher.internal.helpers.GraphIcing
+import org.neo4j.cypher.internal.javacompat.GraphImpl
+import org.neo4j.cypher.internal.{ExecutionEngine, RewindableExecutionResult}
 import org.neo4j.graphdb._
-import org.neo4j.graphdb.factory.{GraphDatabaseFactory, GraphDatabaseSettings}
+import org.neo4j.graphdb.factory.GraphDatabaseSettings
 import org.neo4j.graphdb.index.Index
-import org.neo4j.kernel.configuration.Settings
 import org.neo4j.kernel.GraphDatabaseAPI
+import org.neo4j.kernel.configuration.Settings
 import org.neo4j.kernel.impl.api.KernelStatement
 import org.neo4j.kernel.impl.api.index.IndexingService
 import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingMode
 import org.neo4j.kernel.impl.core.ThreadToStatementContextBridge
 import org.neo4j.test.GraphDatabaseServiceCleaner.cleanDatabaseContent
 import org.neo4j.test.{AsciiDocGenerator, GraphDescription, TestGraphDatabaseFactory}
-import org.neo4j.tooling.GlobalGraphOperations
 import org.neo4j.visualization.asciidoc.AsciidocHelper
 import org.neo4j.visualization.graphviz.{AsciiDocStyle, GraphStyle, GraphvizWriter}
 import org.neo4j.walk.Walker
@@ -332,7 +331,7 @@ abstract class DocumentingTestBase extends JUnitSuite with DocumentationHelper w
   }
 
   var db: GraphDatabaseAPI = null
-  var engine: ServerExecutionEngine = null
+  var engine: ExecutionEngine = null
   var nodeMap: Map[String, Long] = null
   var nodeIndex: Index[Node] = null
   var relIndex: Index[Relationship] = null
@@ -446,7 +445,7 @@ abstract class DocumentingTestBase extends JUnitSuite with DocumentationHelper w
       setConfig(GraphDatabaseSettings.node_keys_indexable, "name").
       setConfig(GraphDatabaseSettings.node_auto_indexing, Settings.TRUE).
       newGraphDatabase().asInstanceOf[GraphDatabaseAPI]
-    engine = new ServerExecutionEngine(db)
+    engine = new ExecutionEngine(db)
 
     softReset()
   }

diff --git a/...pher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/tooling/RestartableDatabase.scala b/...pher/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/tooling/RestartableDatabase.scala
@@ -38,7 +38,7 @@ package org.neo4j.cypher.docgen.tooling
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-import org.neo4j.cypher.ExecutionEngine
+import org.neo4j.cypher.internal.ExecutionEngine
 import org.neo4j.graphdb.GraphDatabaseService
 import org.neo4j.test.TestGraphDatabaseFactory
 

diff --git a/.../src/test/scala/org/neo4j/cypher/docgen/tooling/tests/QueryResultContentBuilderTest.scala b/.../src/test/scala/org/neo4j/cypher/docgen/tooling/tests/QueryResultContentBuilderTest.scala
@@ -19,7 +19,7 @@
  */
 package org.neo4j.cypher.docgen.tooling.tests
 
-import org.neo4j.cypher.ExecutionEngine
+import org.neo4j.cypher.internal.ExecutionEngine
 import org.neo4j.cypher.docgen.tooling._
 import org.neo4j.cypher.internal.RewindableExecutionResult
 import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite

diff --git a/...her/graphgist/src/main/java/org/neo4j/cypher/javacompat/internal/DocsExecutionEngine.java b/...her/graphgist/src/main/java/org/neo4j/cypher/javacompat/internal/DocsExecutionEngine.java
@@ -56,7 +56,7 @@ public DocsExecutionEngine( GraphDatabaseService database, LogProvider logProvid
     }
 
     protected
-    org.neo4j.cypher.ExecutionEngine createInnerEngine( GraphDatabaseService database, LogProvider logProvider )
+    org.neo4j.cypher.internal.ExecutionEngine createInnerEngine( GraphDatabaseService database, LogProvider logProvider )
     {
         return new org.neo4j.cypher.internal.DocsExecutionEngine( database, logProvider, null, null );
     }
@@ -70,7 +70,7 @@ org.neo4j.cypher.ExecutionEngine createInnerEngine( GraphDatabaseService databas
      */
     public InternalExecutionResult execute( String query ) throws CypherException
     {
-        return (InternalExecutionResult) inner.internalExecute( query, Collections.<String, Object> emptyMap() );
+        return inner.internalExecute( query, Collections.<String, Object> emptyMap() );
     }
 
     /**
@@ -83,7 +83,7 @@ public InternalExecutionResult execute( String query ) throws CypherException
      */
     public InternalExecutionResult execute( String query, Map<String,Object> params ) throws CypherException
     {
-        return (InternalExecutionResult) inner.internalExecute( query, params );
+        return inner.internalExecute( query, params );
     }
 
     /**
@@ -99,7 +99,7 @@ public InternalExecutionResult execute( String query, Map<String,Object> params
      */
     public InternalExecutionResult profile( String query ) throws CypherException
     {
-        return (InternalExecutionResult) inner.internalProfile( query, Collections.<String, Object> emptyMap() );
+        return inner.internalProfile( query, Collections.<String, Object> emptyMap() );
     }
 
     /**
@@ -116,7 +116,7 @@ public InternalExecutionResult profile( String query ) throws CypherException
      */
     public InternalExecutionResult profile( String query, Map<String,Object> params ) throws CypherException
     {
-        return (InternalExecutionResult) inner.internalProfile( query, params );
+        return inner.internalProfile( query, params );
     }
 
     /**

diff --git a/manual/cypher/graphgist/src/main/scala/org/neo4j/cypher/internal/DocsExecutionEngine.scala b/manual/cypher/graphgist/src/main/scala/org/neo4j/cypher/internal/DocsExecutionEngine.scala
@@ -21,8 +21,8 @@ package org.neo4j.cypher.internal
 
 import java.util.{Map => JavaMap}
 
+import org.neo4j.cypher.SyntaxException
 import org.neo4j.cypher.internal.compiler.v3_0.executionplan.InternalExecutionResult
-import org.neo4j.cypher.{ExecutionEngine, SyntaxException}
 import org.neo4j.graphdb.GraphDatabaseService
 import org.neo4j.kernel.impl.query.{QueryExecutionMonitor, QuerySession}
 import org.neo4j.logging.{LogProvider, NullLogProvider}

diff --git a/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/RefcardTest.scala b/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/RefcardTest.scala
@@ -19,26 +19,24 @@
  */
 package org.neo4j.cypher.docgen
 
+import java.io.{File, FileOutputStream, OutputStreamWriter, PrintWriter, Writer}
 import java.nio.charset.StandardCharsets
 
-import org.neo4j.cypher.internal.RewindableExecutionResult
+import org.junit.{After, Before, Test}
+import org.neo4j.cypher._
 import org.neo4j.cypher.internal.compiler.v3_0.executionplan.InternalExecutionResult
 import org.neo4j.cypher.internal.compiler.v3_0.prettifier.Prettifier
-import org.neo4j.graphdb.index.Index
-import org.junit.Test
-import scala.collection.JavaConverters._
-import java.io.{ File, FileOutputStream, OutputStreamWriter, PrintWriter, Writer }
+import org.neo4j.cypher.internal.helpers.GraphIcing
+import org.neo4j.cypher.internal.javacompat.GraphImpl
+import org.neo4j.cypher.internal.{ExecutionEngine, ExecutionResult, RewindableExecutionResult}
 import org.neo4j.graphdb._
+import org.neo4j.graphdb.index.Index
 import org.neo4j.kernel.GraphDatabaseAPI
+import org.neo4j.test.{GraphDatabaseServiceCleaner, GraphDescription, TestGraphDatabaseFactory}
 import org.neo4j.visualization.asciidoc.AsciidocHelper
-import org.neo4j.cypher.javacompat.GraphImpl
-import org.neo4j.cypher._
-import org.neo4j.test.{GraphDatabaseServiceCleaner, ImpermanentGraphDatabase, TestGraphDatabaseFactory,
-GraphDescription}
 import org.scalatest.Assertions
-import org.junit.Before
-import org.junit.After
-import org.neo4j.cypher.internal.helpers.GraphIcing
+
+import scala.collection.JavaConverters._
 
 /*
 Use this base class for refcard tests

diff --git a/...cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/AggregationTest.scala b/...cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/AggregationTest.scala
@@ -19,9 +19,9 @@
  */
 package org.neo4j.cypher.docgen.refcard
 
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.InternalExecutionResult
-import org.neo4j.cypher.{ ExecutionResult, QueryStatisticsTestSupport }
+import org.neo4j.cypher.QueryStatisticsTestSupport
 import org.neo4j.cypher.docgen.RefcardTest
+import org.neo4j.cypher.internal.compiler.v3_0.executionplan.InternalExecutionResult
 
 class AggregationTest extends RefcardTest with QueryStatisticsTestSupport {
   val graphDescription = List("ROOT KNOWS A", "A KNOWS B", "B KNOWS C", "C KNOWS ROOT")

diff --git a/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/IndexTest.scala b/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/IndexTest.scala
@@ -19,12 +19,12 @@
  */
 package org.neo4j.cypher.docgen.refcard
 
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.InternalExecutionResult
-import org.neo4j.cypher.{ ExecutionResult, QueryStatisticsTestSupport }
-import org.neo4j.cypher.docgen.RefcardTest
-import org.neo4j.graphdb.DynamicLabel
 import java.util.concurrent.TimeUnit
 
+import org.neo4j.cypher.QueryStatisticsTestSupport
+import org.neo4j.cypher.docgen.RefcardTest
+import org.neo4j.cypher.internal.compiler.v3_0.executionplan.InternalExecutionResult
+
 class IndexTest extends RefcardTest with QueryStatisticsTestSupport {
   val graphDescription = List("A:Person KNOWS B:Person")
   val title = "INDEX"

diff --git a/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/LabelsTest.scala b/manual/cypher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/LabelsTest.scala
@@ -19,9 +19,9 @@
  */
 package org.neo4j.cypher.docgen.refcard
 
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.InternalExecutionResult
-import org.neo4j.cypher.{ ExecutionResult, QueryStatisticsTestSupport }
+import org.neo4j.cypher.QueryStatisticsTestSupport
 import org.neo4j.cypher.docgen.RefcardTest
+import org.neo4j.cypher.internal.compiler.v3_0.executionplan.InternalExecutionResult
 
 class LabelsTest extends RefcardTest with QueryStatisticsTestSupport {
   val graphDescription = List("A:Person KNOWS ROOT")

diff --git a/...pher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/PathFunctionsTest.scala b/...pher/refcard-tests/src/test/scala/org/neo4j/cypher/docgen/refcard/PathFunctionsTest.scala
@@ -19,9 +19,9 @@
  */
 package org.neo4j.cypher.docgen.refcard
 
-import org.neo4j.cypher.internal.compiler.v3_0.executionplan.InternalExecutionResult
-import org.neo4j.cypher.{ ExecutionResult, QueryStatisticsTestSupport }
+import org.neo4j.cypher.QueryStatisticsTestSupport
 import org.neo4j.cypher.docgen.RefcardTest
+import org.neo4j.cypher.internal.compiler.v3_0.executionplan.InternalExecutionResult
 
 class PathFunctionsTest extends RefcardTest with QueryStatisticsTestSupport {
   val graphDescription = List("ROOT KNOWS A", "A:Person KNOWS B:Person", "B KNOWS C:Person", "C KNOWS ROOT")