From 7159ea1af1dfc52869bcaa6558e026eca99769bf Mon Sep 17 00:00:00 2001
From: Davide Grohmann <davide.grohmann@neotechnology.com>
Date: Mon, 15 Feb 2016 16:54:55 +0100
Subject: [PATCH] Repackage javacompat.internal to internal.javacompat

---
 .../javacompat}/CypherEngineProvider.java                 | 2 +-
 .../internal => internal/javacompat}/Description.java     | 4 ++--
 .../internal => internal/javacompat}/ExecutionEngine.java | 2 +-
 .../internal => internal/javacompat}/ExecutionResult.java | 2 +-
 .../internal => internal/javacompat}/PlanDescription.java | 2 +-
 .../javacompat}/ProfilerStatistics.java                   | 2 +-
 .../internal => internal/javacompat}/QueryStatistics.java | 2 +-
 .../javacompat}/ServerExecutionEngine.java                | 2 +-
 .../org.neo4j.kernel.impl.query.QueryEngineProvider       | 2 +-
 .../cypher/internal/AmendedRootPlanDescription.scala      | 4 +---
 .../scala/org/neo4j/cypher/internal/PlanDescription.scala | 2 +-
 .../scala/org/neo4j/cypher/internal/QueryStatistics.scala | 2 +-
 .../org/neo4j/cypher/internal/ServerExecutionEngine.scala | 2 +-
 .../internal/compatibility/CompatibilityFor2_3.scala      | 8 ++++----
 .../internal/compatibility/CompatibilityFor3_0.scala      | 8 ++++----
 .../test/java/org/neo4j/cypher/ManyMergesStressTest.java  | 4 ++--
 .../src/test/java/org/neo4j/cypher/export/ExportTest.java | 2 +-
 .../org/neo4j/cypher/javacompat/CypherLoggingTest.java    | 2 +-
 .../org/neo4j/cypher/javacompat/CypherUpdateMapTest.java  | 2 +-
 .../org/neo4j/cypher/javacompat/ExecutionEngineTests.java | 4 ++--
 .../org/neo4j/cypher/javacompat/ExecutionResultTest.java  | 4 ++--
 .../cypher/javacompat/JavaValueCompatibilityTest.java     | 4 ++--
 .../java/org/neo4j/server/database/CypherExecutor.java    | 2 +-
 .../neo4j/server/database/ExecutionEngineProvider.java    | 2 +-
 24 files changed, 35 insertions(+), 37 deletions(-)
 rename community/cypher/cypher/src/main/java/org/neo4j/cypher/{javacompat/internal => internal/javacompat}/CypherEngineProvider.java (97%)
 rename community/cypher/cypher/src/main/java/org/neo4j/cypher/{javacompat/internal => internal/javacompat}/Description.java (96%)
 rename community/cypher/cypher/src/main/java/org/neo4j/cypher/{javacompat/internal => internal/javacompat}/ExecutionEngine.java (99%)
 rename community/cypher/cypher/src/main/java/org/neo4j/cypher/{javacompat/internal => internal/javacompat}/ExecutionResult.java (99%)
 rename community/cypher/cypher/src/main/java/org/neo4j/cypher/{javacompat/internal => internal/javacompat}/PlanDescription.java (97%)
 rename community/cypher/cypher/src/main/java/org/neo4j/cypher/{javacompat/internal => internal/javacompat}/ProfilerStatistics.java (96%)
 rename community/cypher/cypher/src/main/java/org/neo4j/cypher/{javacompat/internal => internal/javacompat}/QueryStatistics.java (98%)
 rename community/cypher/cypher/src/main/java/org/neo4j/cypher/{javacompat/internal => internal/javacompat}/ServerExecutionEngine.java (98%)

diff --git a/community/cypher/cypher/src/main/java/org/neo4j/cypher/javacompat/internal/CypherEngineProvider.java b/community/cypher/cypher/src/main/java/org/neo4j/cypher/internal/javacompat/CypherEngineProvider.java
similarity index 97%
rename from community/cypher/cypher/src/main/java/org/neo4j/cypher/javacompat/internal/CypherEngineProvider.java
rename to community/cypher/cypher/src/main/java/org/neo4j/cypher/internal/javacompat/CypherEngineProvider.java
index fc68974cb7e05..54e6bd1413127 100644
--- a/community/cypher/cypher/src/main/java/org/neo4j/cypher/javacompat/internal/CypherEngineProvider.java
+++ b/community/cypher/cypher/src/main/java/org/neo4j/cypher/internal/javacompat/CypherEngineProvider.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.javacompat.internal;
+package org.neo4j.cypher.internal.javacompat;
 
 import org.neo4j.helpers.Service;
 import org.neo4j.kernel.GraphDatabaseAPI;
diff --git a/community/cypher/cypher/src/main/java/org/neo4j/cypher/javacompat/internal/Description.java b/community/cypher/cypher/src/main/java/org/neo4j/cypher/internal/javacompat/Description.java
similarity index 96%
rename from community/cypher/cypher/src/main/java/org/neo4j/cypher/javacompat/internal/Description.java
rename to community/cypher/cypher/src/main/java/org/neo4j/cypher/internal/javacompat/Description.java
index bf4a739915427..d608099c10c21 100644
--- a/community/cypher/cypher/src/main/java/org/neo4j/cypher/javacompat/internal/Description.java
+++ b/community/cypher/cypher/src/main/java/org/neo4j/cypher/internal/javacompat/Description.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.javacompat.internal;
+package org.neo4j.cypher.internal.javacompat;
 
 import scala.collection.JavaConversions;
 
@@ -92,7 +92,7 @@ public boolean hasProfilerStatistics()
     @Override
     public ProfilerStatistics getProfilerStatistics()
     {
-        final org.neo4j.cypher.javacompat.internal.ProfilerStatistics statistics;
+        final org.neo4j.cypher.internal.javacompat.ProfilerStatistics statistics;
         try
         {
             statistics = description.asJava().getProfilerStatistics();
diff --git a/community/cypher/cypher/src/main/java/org/neo4j/cypher/javacompat/internal/ExecutionEngine.java b/community/cypher/cypher/src/main/java/org/neo4j/cypher/internal/javacompat/ExecutionEngine.java
similarity index 99%
rename from community/cypher/cypher/src/main/java/org/neo4j/cypher/javacompat/internal/ExecutionEngine.java
rename to community/cypher/cypher/src/main/java/org/neo4j/cypher/internal/javacompat/ExecutionEngine.java
index f301394a5f1b3..cad0dbe2fe767 100644
--- a/community/cypher/cypher/src/main/java/org/neo4j/cypher/javacompat/internal/ExecutionEngine.java
+++ b/community/cypher/cypher/src/main/java/org/neo4j/cypher/internal/javacompat/ExecutionEngine.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.javacompat.internal;
+package org.neo4j.cypher.internal.javacompat;
 
 import java.util.Map;
 
diff --git a/community/cypher/cypher/src/main/java/org/neo4j/cypher/javacompat/internal/ExecutionResult.java b/community/cypher/cypher/src/main/java/org/neo4j/cypher/internal/javacompat/ExecutionResult.java
similarity index 99%
rename from community/cypher/cypher/src/main/java/org/neo4j/cypher/javacompat/internal/ExecutionResult.java
rename to community/cypher/cypher/src/main/java/org/neo4j/cypher/internal/javacompat/ExecutionResult.java
index c00d708711986..a1e39034ec393 100644
--- a/community/cypher/cypher/src/main/java/org/neo4j/cypher/javacompat/internal/ExecutionResult.java
+++ b/community/cypher/cypher/src/main/java/org/neo4j/cypher/internal/javacompat/ExecutionResult.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.javacompat.internal;
+package org.neo4j.cypher.internal.javacompat;
 
 import scala.collection.JavaConversions;
 
diff --git a/community/cypher/cypher/src/main/java/org/neo4j/cypher/javacompat/internal/PlanDescription.java b/community/cypher/cypher/src/main/java/org/neo4j/cypher/internal/javacompat/PlanDescription.java
similarity index 97%
rename from community/cypher/cypher/src/main/java/org/neo4j/cypher/javacompat/internal/PlanDescription.java
rename to community/cypher/cypher/src/main/java/org/neo4j/cypher/internal/javacompat/PlanDescription.java
index 510c4f1bd6194..77a77185cd518 100644
--- a/community/cypher/cypher/src/main/java/org/neo4j/cypher/javacompat/internal/PlanDescription.java
+++ b/community/cypher/cypher/src/main/java/org/neo4j/cypher/internal/javacompat/PlanDescription.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.javacompat.internal;
+package org.neo4j.cypher.internal.javacompat;
 
 
 import java.util.List;
diff --git a/community/cypher/cypher/src/main/java/org/neo4j/cypher/javacompat/internal/ProfilerStatistics.java b/community/cypher/cypher/src/main/java/org/neo4j/cypher/internal/javacompat/ProfilerStatistics.java
similarity index 96%
rename from community/cypher/cypher/src/main/java/org/neo4j/cypher/javacompat/internal/ProfilerStatistics.java
rename to community/cypher/cypher/src/main/java/org/neo4j/cypher/internal/javacompat/ProfilerStatistics.java
index 8f850778604ba..ec9ef1518e533 100644
--- a/community/cypher/cypher/src/main/java/org/neo4j/cypher/javacompat/internal/ProfilerStatistics.java
+++ b/community/cypher/cypher/src/main/java/org/neo4j/cypher/internal/javacompat/ProfilerStatistics.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.javacompat.internal;
+package org.neo4j.cypher.internal.javacompat;
 
 /**
  * Profiler statistics for a single execution step of a Cypher query execution plan
diff --git a/community/cypher/cypher/src/main/java/org/neo4j/cypher/javacompat/internal/QueryStatistics.java b/community/cypher/cypher/src/main/java/org/neo4j/cypher/internal/javacompat/QueryStatistics.java
similarity index 98%
rename from community/cypher/cypher/src/main/java/org/neo4j/cypher/javacompat/internal/QueryStatistics.java
rename to community/cypher/cypher/src/main/java/org/neo4j/cypher/internal/javacompat/QueryStatistics.java
index 8d65166e2431e..ec4d0fe1b90cb 100644
--- a/community/cypher/cypher/src/main/java/org/neo4j/cypher/javacompat/internal/QueryStatistics.java
+++ b/community/cypher/cypher/src/main/java/org/neo4j/cypher/internal/javacompat/QueryStatistics.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.javacompat.internal;
+package org.neo4j.cypher.internal.javacompat;
 
 /**
  * Holds statistics for the execution of a query.
diff --git a/community/cypher/cypher/src/main/java/org/neo4j/cypher/javacompat/internal/ServerExecutionEngine.java b/community/cypher/cypher/src/main/java/org/neo4j/cypher/internal/javacompat/ServerExecutionEngine.java
similarity index 98%
rename from community/cypher/cypher/src/main/java/org/neo4j/cypher/javacompat/internal/ServerExecutionEngine.java
rename to community/cypher/cypher/src/main/java/org/neo4j/cypher/internal/javacompat/ServerExecutionEngine.java
index 405dc3de5c9e7..52e240f3575c3 100644
--- a/community/cypher/cypher/src/main/java/org/neo4j/cypher/javacompat/internal/ServerExecutionEngine.java
+++ b/community/cypher/cypher/src/main/java/org/neo4j/cypher/internal/javacompat/ServerExecutionEngine.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.cypher.javacompat.internal;
+package org.neo4j.cypher.internal.javacompat;
 
 import java.util.Map;
 
diff --git a/community/cypher/cypher/src/main/resources/META-INF/services/org.neo4j.kernel.impl.query.QueryEngineProvider b/community/cypher/cypher/src/main/resources/META-INF/services/org.neo4j.kernel.impl.query.QueryEngineProvider
index f7d980db49739..842c824082b6b 100644
--- a/community/cypher/cypher/src/main/resources/META-INF/services/org.neo4j.kernel.impl.query.QueryEngineProvider
+++ b/community/cypher/cypher/src/main/resources/META-INF/services/org.neo4j.kernel.impl.query.QueryEngineProvider
@@ -1 +1 @@
-org.neo4j.cypher.javacompat.internal.CypherEngineProvider
+javacompat.CypherEngineProvider
diff --git a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/AmendedRootPlanDescription.scala b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/AmendedRootPlanDescription.scala
index 7c6bb7bee693f..acd6136e03b78 100644
--- a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/AmendedRootPlanDescription.scala
+++ b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/AmendedRootPlanDescription.scala
@@ -22,10 +22,8 @@ package org.neo4j.cypher.internal
 import java.util
 
 import org.neo4j.cypher.internal.compiler.v3_0.{RuntimeName, PlannerName}
-import org.neo4j.cypher.javacompat.internal
 import org.neo4j.cypher.CypherVersion
 
-
 class AmendedRootPlanDescription(inner: ExtendedPlanDescription, version: CypherVersion, planner: PlannerName, runtime: RuntimeName)
   extends ExtendedPlanDescription {
 
@@ -35,7 +33,7 @@ class AmendedRootPlanDescription(inner: ExtendedPlanDescription, version: Cypher
 
   def name = inner.name
 
-  def asJava = new internal.PlanDescription {
+  def asJava = new javacompat.PlanDescription {
     val getName = name
 
     val getProfilerStatistics = childAsJava.getProfilerStatistics
diff --git a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/PlanDescription.scala b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/PlanDescription.scala
index 4ffddcb53fcb3..ffe0d5bb54be5 100644
--- a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/PlanDescription.scala
+++ b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/PlanDescription.scala
@@ -33,7 +33,7 @@ trait PlanDescription {
   def children: Seq[PlanDescription] = throw new UnsupportedOperationException("This should not have been called")
   def hasProfilerStatistics: Boolean = throw new UnsupportedOperationException("This should not have been called")
 
-  def asJava: org.neo4j.cypher.javacompat.internal.PlanDescription
+  def asJava: javacompat.PlanDescription
 
   def render(builder: StringBuilder) {}
   def render(builder: StringBuilder, separator: String, levelSuffix: String) {}
diff --git a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/QueryStatistics.scala b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/QueryStatistics.scala
index ad0fbf65332d8..4429dd55ea757 100644
--- a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/QueryStatistics.scala
+++ b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/QueryStatistics.scala
@@ -21,7 +21,7 @@ package org.neo4j.cypher.internal
 
 // Whenever you add a field here, please update the following classes:
 //
-// org.neo4j.cypher.javacompat.internal.QueryStatistics
+// org.neo4j.cypher.internal.javacompact.QueryStatistics
 // org.neo4j.server.rest.repr.CypherResultRepresentation
 // org.neo4j.server.rest.CypherFunctionalTest
 // org.neo4j.cypher.QueryStatisticsTestSupport
diff --git a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/ServerExecutionEngine.scala b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/ServerExecutionEngine.scala
index 2075c39b30782..e7c359e68df9d 100644
--- a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/ServerExecutionEngine.scala
+++ b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/ServerExecutionEngine.scala
@@ -23,7 +23,7 @@ import org.neo4j.graphdb.GraphDatabaseService
 import org.neo4j.logging.{NullLogProvider, LogProvider}
 
 /**
- * This is used by {@link org.neo4j.cypher.javacompat.internal.ServerExecutionEngine} to provide additional
+ * This is used by {@link org.neo4j.cypher.internal.javacompact.ServerExecutionEngine} to provide additional
  * API to REST server
  *
  */
diff --git a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/CompatibilityFor2_3.scala b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/CompatibilityFor2_3.scala
index 66d6cd6d6f59c..d077281deb6a6 100644
--- a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/CompatibilityFor2_3.scala
+++ b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/CompatibilityFor2_3.scala
@@ -33,9 +33,9 @@ import org.neo4j.cypher.internal.compiler.{v2_3, v3_0}
 import org.neo4j.cypher.internal.frontend.v2_3.notification.{InternalNotification, LegacyPlannerNotification, PlannerUnsupportedNotification, RuntimeUnsupportedNotification, _}
 import org.neo4j.cypher.internal.frontend.v2_3.spi.MapToPublicExceptions
 import org.neo4j.cypher.internal.frontend.v2_3.{CypherException => InternalCypherException, InputPosition => InternalInputPosition}
+import org.neo4j.cypher.internal.javacompat.{PlanDescription, ProfilerStatistics}
 import org.neo4j.cypher.internal.spi.v2_3.{GeneratedQueryStructure, TransactionBoundGraphStatistics, TransactionBoundPlanContext, TransactionBoundQueryContext}
 import org.neo4j.cypher.internal.{CypherExecutionMode, ExtendedExecutionResult, ExtendedPlanDescription, LastCommittedTxIdProvider, ParsedQuery, PreParsedQuery, QueryStatistics, TransactionInfo}
-import org.neo4j.cypher.javacompat.internal.ProfilerStatistics
 import org.neo4j.graphdb.Result.ResultVisitor
 import org.neo4j.graphdb._
 import org.neo4j.graphdb.impl.notification.{NotificationCode, NotificationDetail}
@@ -369,7 +369,7 @@ case class CompatibilityPlanDescriptionFor2_3(inner: InternalPlanDescription, ve
 
   def name = exceptionHandlerFor2_3.runSafely { inner.name }
 
-  def asJava: javacompat.internal.PlanDescription = exceptionHandlerFor2_3.runSafely { asJava(self) }
+  def asJava: PlanDescription = exceptionHandlerFor2_3.runSafely { asJava(self) }
 
   override def toString: String = {
     val NL = System.lineSeparator()
@@ -378,7 +378,7 @@ case class CompatibilityPlanDescriptionFor2_3(inner: InternalPlanDescription, ve
     }
   }
 
-  def asJava(in: ExtendedPlanDescription): javacompat.internal.PlanDescription = new javacompat.internal.PlanDescription {
+  def asJava(in: ExtendedPlanDescription): PlanDescription = new PlanDescription {
     def getProfilerStatistics: ProfilerStatistics = new ProfilerStatistics {
       def getDbHits: Long = extract { case DbHits(count) => count}
 
@@ -396,7 +396,7 @@ case class CompatibilityPlanDescriptionFor2_3(inner: InternalPlanDescription, ve
 
     def getIdentifiers: util.Set[String] = identifiers.asJava
 
-    def getChildren: util.List[javacompat.internal.PlanDescription] = in.extendedChildren.toList.map(_.asJava).asJava
+    def getChildren: util.List[PlanDescription] = in.extendedChildren.toList.map(_.asJava).asJava
 
     override def toString: String = self.toString
   }
diff --git a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/CompatibilityFor3_0.scala b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/CompatibilityFor3_0.scala
index 6d15a1d298972..2715ee9f08c58 100644
--- a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/CompatibilityFor3_0.scala
+++ b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/CompatibilityFor3_0.scala
@@ -34,9 +34,9 @@ import org.neo4j.cypher.internal.compiler.v3_0.{CypherCompilerFactory, DPPlanner
 import org.neo4j.cypher.internal.frontend.v3_0.notification.{InternalNotification, PlannerUnsupportedNotification, RuntimeUnsupportedNotification, _}
 import org.neo4j.cypher.internal.frontend.v3_0.spi.MapToPublicExceptions
 import org.neo4j.cypher.internal.frontend.v3_0.{CypherException => InternalCypherException}
+import org.neo4j.cypher.internal.javacompat.ProfilerStatistics
 import org.neo4j.cypher.internal.spi.v3_0.TransactionBoundQueryContext.IndexSearchMonitor
 import org.neo4j.cypher.internal.spi.v3_0._
-import org.neo4j.cypher.javacompat.internal.ProfilerStatistics
 import org.neo4j.graphdb.Result.{ResultRow, ResultVisitor}
 import org.neo4j.graphdb.impl.notification.{NotificationCode, NotificationDetail}
 import org.neo4j.graphdb.{GraphDatabaseService, InputPosition, Node, Path, QueryExecutionType, Relationship, ResourceIterator}
@@ -412,7 +412,7 @@ case class CompatibilityPlanDescriptionFor3_0(inner: InternalPlanDescription, ve
 
   def name = exceptionHandlerFor3_0.runSafely { inner.name }
 
-  def asJava: javacompat.internal.PlanDescription = exceptionHandlerFor3_0.runSafely { asJava(self) }
+  def asJava: javacompat.PlanDescription = exceptionHandlerFor3_0.runSafely { asJava(self) }
 
   override def toString: String = {
     val NL = System.lineSeparator()
@@ -421,7 +421,7 @@ case class CompatibilityPlanDescriptionFor3_0(inner: InternalPlanDescription, ve
     }
   }
 
-  def asJava(in: ExtendedPlanDescription): javacompat.internal.PlanDescription = new javacompat.internal.PlanDescription {
+  def asJava(in: ExtendedPlanDescription): javacompat.PlanDescription = new javacompat.PlanDescription {
     def getProfilerStatistics: ProfilerStatistics = new ProfilerStatistics {
       def getDbHits: Long = extract { case DbHits(count) => count}
 
@@ -439,7 +439,7 @@ case class CompatibilityPlanDescriptionFor3_0(inner: InternalPlanDescription, ve
 
     def getIdentifiers: util.Set[String] = identifiers.asJava
 
-    def getChildren: util.List[javacompat.internal.PlanDescription] = in.extendedChildren.toList.map(_.asJava).asJava
+    def getChildren: util.List[javacompat.PlanDescription] = in.extendedChildren.toList.map(_.asJava).asJava
 
     override def toString: String = self.toString
   }
diff --git a/community/cypher/cypher/src/test/java/org/neo4j/cypher/ManyMergesStressTest.java b/community/cypher/cypher/src/test/java/org/neo4j/cypher/ManyMergesStressTest.java
index 0c0e0dda28328..373df9199cddc 100644
--- a/community/cypher/cypher/src/test/java/org/neo4j/cypher/ManyMergesStressTest.java
+++ b/community/cypher/cypher/src/test/java/org/neo4j/cypher/ManyMergesStressTest.java
@@ -27,8 +27,8 @@
 import org.junit.Rule;
 import org.junit.Test;
 
-import org.neo4j.cypher.javacompat.internal.ExecutionEngine;
-import org.neo4j.cypher.javacompat.internal.ExecutionResult;
+import org.neo4j.cypher.internal.javacompat.ExecutionEngine;
+import org.neo4j.cypher.internal.javacompat.ExecutionResult;
 import org.neo4j.graphdb.GraphDatabaseService;
 import org.neo4j.graphdb.Label;
 import org.neo4j.graphdb.Transaction;
diff --git a/community/cypher/cypher/src/test/java/org/neo4j/cypher/export/ExportTest.java b/community/cypher/cypher/src/test/java/org/neo4j/cypher/export/ExportTest.java
index 5a323ea20df5e..46306464706ba 100644
--- a/community/cypher/cypher/src/test/java/org/neo4j/cypher/export/ExportTest.java
+++ b/community/cypher/cypher/src/test/java/org/neo4j/cypher/export/ExportTest.java
@@ -31,7 +31,7 @@
 import java.util.Iterator;
 import java.util.Map;
 
-import org.neo4j.cypher.javacompat.internal.ExecutionResult;
+import org.neo4j.cypher.internal.javacompat.ExecutionResult;
 import org.neo4j.graphalgo.impl.util.PathImpl;
 import org.neo4j.graphdb.GraphDatabaseService;
 import org.neo4j.graphdb.Label;
diff --git a/community/cypher/cypher/src/test/java/org/neo4j/cypher/javacompat/CypherLoggingTest.java b/community/cypher/cypher/src/test/java/org/neo4j/cypher/javacompat/CypherLoggingTest.java
index 095e54298c92e..be4220166682b 100644
--- a/community/cypher/cypher/src/test/java/org/neo4j/cypher/javacompat/CypherLoggingTest.java
+++ b/community/cypher/cypher/src/test/java/org/neo4j/cypher/javacompat/CypherLoggingTest.java
@@ -23,7 +23,7 @@
 
 import org.junit.Test;
 
-import org.neo4j.cypher.javacompat.internal.ExecutionEngine;
+import org.neo4j.cypher.internal.javacompat.ExecutionEngine;
 import org.neo4j.logging.AssertableLogProvider;
 import org.neo4j.logging.LogProvider;
 import org.neo4j.test.TestGraphDatabaseFactory;
diff --git a/community/cypher/cypher/src/test/java/org/neo4j/cypher/javacompat/CypherUpdateMapTest.java b/community/cypher/cypher/src/test/java/org/neo4j/cypher/javacompat/CypherUpdateMapTest.java
index 1d7e17e6df4c2..eed82e27bf964 100644
--- a/community/cypher/cypher/src/test/java/org/neo4j/cypher/javacompat/CypherUpdateMapTest.java
+++ b/community/cypher/cypher/src/test/java/org/neo4j/cypher/javacompat/CypherUpdateMapTest.java
@@ -23,7 +23,7 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import org.neo4j.cypher.javacompat.internal.ExecutionEngine;
+import org.neo4j.cypher.internal.javacompat.ExecutionEngine;
 import org.neo4j.graphdb.GraphDatabaseService;
 import org.neo4j.graphdb.Node;
 import org.neo4j.graphdb.Transaction;
diff --git a/community/cypher/cypher/src/test/java/org/neo4j/cypher/javacompat/ExecutionEngineTests.java b/community/cypher/cypher/src/test/java/org/neo4j/cypher/javacompat/ExecutionEngineTests.java
index b66f7fd196d03..03edc49735c70 100644
--- a/community/cypher/cypher/src/test/java/org/neo4j/cypher/javacompat/ExecutionEngineTests.java
+++ b/community/cypher/cypher/src/test/java/org/neo4j/cypher/javacompat/ExecutionEngineTests.java
@@ -25,8 +25,8 @@
 import org.junit.Rule;
 import org.junit.Test;
 
-import org.neo4j.cypher.javacompat.internal.ExecutionEngine;
-import org.neo4j.cypher.javacompat.internal.ExecutionResult;
+import org.neo4j.cypher.internal.javacompat.ExecutionEngine;
+import org.neo4j.cypher.internal.javacompat.ExecutionResult;
 import org.neo4j.test.DatabaseRule;
 import org.neo4j.test.ImpermanentDatabaseRule;
 
diff --git a/community/cypher/cypher/src/test/java/org/neo4j/cypher/javacompat/ExecutionResultTest.java b/community/cypher/cypher/src/test/java/org/neo4j/cypher/javacompat/ExecutionResultTest.java
index 8b4433cbcef90..719e80f25dffe 100644
--- a/community/cypher/cypher/src/test/java/org/neo4j/cypher/javacompat/ExecutionResultTest.java
+++ b/community/cypher/cypher/src/test/java/org/neo4j/cypher/javacompat/ExecutionResultTest.java
@@ -28,8 +28,8 @@
 import java.util.Map;
 
 import org.neo4j.cypher.ArithmeticException;
-import org.neo4j.cypher.javacompat.internal.ExecutionEngine;
-import org.neo4j.cypher.javacompat.internal.ExecutionResult;
+import org.neo4j.cypher.internal.javacompat.ExecutionEngine;
+import org.neo4j.cypher.internal.javacompat.ExecutionResult;
 import org.neo4j.graphdb.Node;
 import org.neo4j.graphdb.ResourceIterator;
 import org.neo4j.graphdb.Result;
diff --git a/community/cypher/cypher/src/test/java/org/neo4j/cypher/javacompat/JavaValueCompatibilityTest.java b/community/cypher/cypher/src/test/java/org/neo4j/cypher/javacompat/JavaValueCompatibilityTest.java
index c23dd947503c4..aea398d9d1d2d 100644
--- a/community/cypher/cypher/src/test/java/org/neo4j/cypher/javacompat/JavaValueCompatibilityTest.java
+++ b/community/cypher/cypher/src/test/java/org/neo4j/cypher/javacompat/JavaValueCompatibilityTest.java
@@ -27,8 +27,8 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import org.neo4j.cypher.javacompat.internal.ExecutionEngine;
-import org.neo4j.cypher.javacompat.internal.ExecutionResult;
+import org.neo4j.cypher.internal.javacompat.ExecutionEngine;
+import org.neo4j.cypher.internal.javacompat.ExecutionResult;
 import org.neo4j.graphdb.GraphDatabaseService;
 import org.neo4j.graphdb.ResourceIterator;
 import org.neo4j.test.TestGraphDatabaseFactory;
diff --git a/community/server/src/main/java/org/neo4j/server/database/CypherExecutor.java b/community/server/src/main/java/org/neo4j/server/database/CypherExecutor.java
index 96bfebfc22107..aad061a26b72e 100644
--- a/community/server/src/main/java/org/neo4j/server/database/CypherExecutor.java
+++ b/community/server/src/main/java/org/neo4j/server/database/CypherExecutor.java
@@ -19,7 +19,7 @@
  */
 package org.neo4j.server.database;
 
-import org.neo4j.cypher.javacompat.internal.ServerExecutionEngine;
+import org.neo4j.cypher.internal.javacompat.ServerExecutionEngine;
 import org.neo4j.kernel.impl.query.QueryExecutionEngine;
 import org.neo4j.kernel.lifecycle.LifecycleAdapter;
 
diff --git a/community/server/src/main/java/org/neo4j/server/database/ExecutionEngineProvider.java b/community/server/src/main/java/org/neo4j/server/database/ExecutionEngineProvider.java
index 6a25931e311f3..1da265f2bcecd 100644
--- a/community/server/src/main/java/org/neo4j/server/database/ExecutionEngineProvider.java
+++ b/community/server/src/main/java/org/neo4j/server/database/ExecutionEngineProvider.java
@@ -22,7 +22,7 @@
 import javax.ws.rs.ext.Provider;
 
 import com.sun.jersey.api.core.HttpContext;
-import org.neo4j.cypher.javacompat.internal.ExecutionEngine;
+import org.neo4j.cypher.internal.javacompat.ExecutionEngine;
 
 /**
  * This exists as a convenience for extension authors, to access the cypher execution engine.