Repackage javacompat.internal to internal.javacompat

neo4j · Feb 16, 2016 · 7159ea1 · 7159ea1
1 parent 1079c0b
commit 7159ea1
Show file tree

Hide file tree

Showing 24 changed files with 35 additions and 37 deletions.
diff --git a/...compat/internal/CypherEngineProvider.java → ...rnal/javacompat/CypherEngineProvider.java b/...compat/internal/CypherEngineProvider.java → ...rnal/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/...pher/javacompat/internal/Description.java → ...pher/internal/javacompat/Description.java b/...pher/javacompat/internal/Description.java → ...pher/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/.../javacompat/internal/ExecutionEngine.java → .../internal/javacompat/ExecutionEngine.java b/.../javacompat/internal/ExecutionEngine.java → .../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/.../javacompat/internal/ExecutionResult.java → .../internal/javacompat/ExecutionResult.java b/.../javacompat/internal/ExecutionResult.java → .../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/.../javacompat/internal/PlanDescription.java → .../internal/javacompat/PlanDescription.java b/.../javacompat/internal/PlanDescription.java → .../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/...vacompat/internal/ProfilerStatistics.java → ...ternal/javacompat/ProfilerStatistics.java b/...vacompat/internal/ProfilerStatistics.java → ...ternal/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/.../javacompat/internal/QueryStatistics.java → .../internal/javacompat/QueryStatistics.java b/.../javacompat/internal/QueryStatistics.java → .../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/...ompat/internal/ServerExecutionEngine.java → ...nal/javacompat/ServerExecutionEngine.java b/...ompat/internal/ServerExecutionEngine.java → ...nal/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/...pher/src/main/resources/META-INF/services/org.neo4j.kernel.impl.query.QueryEngineProvider b/...pher/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/...y/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/AmendedRootPlanDescription.scala b/...y/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
@@ -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
@@ -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
@@ -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/...r/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/CompatibilityFor2_3.scala b/...r/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/...r/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/CompatibilityFor3_0.scala b/...r/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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/...y/cypher/cypher/src/test/java/org/neo4j/cypher/javacompat/JavaValueCompatibilityTest.java b/...y/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
@@ -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
@@ -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.