From 3bf846e9dd3c0c40851a47029bc75312b8de917a Mon Sep 17 00:00:00 2001 From: Pontus Melke Date: Wed, 31 Jan 2018 09:08:33 +0100 Subject: [PATCH] Move all stubs to same package --- .../kernel/api/{ => helpers}/NodeData.java | 3 ++- .../kernel/api/{ => helpers}/StubNodeCursor.java | 7 ++++++- .../{ => helpers}/StubNodeLabelIndexCursor.java | 6 +++++- .../api/{ => helpers}/StubPropertyCursor.java | 3 ++- .../kernel/api/{ => helpers}/StubRead.java | 16 ++++++++++++++-- .../impl/newapi/IndexTxStateUpdaterTest.java | 4 ++-- .../v3_4/codegen/CodeGeneratorTest.scala | 2 +- .../ir/BuildProbeTableInstructionsTest.scala | 1 + .../v3_4/codegen/ir/CompiledProfilingTest.scala | 5 +++-- 9 files changed, 36 insertions(+), 11 deletions(-) rename community/kernel-api/src/test/java/org/neo4j/internal/kernel/api/{ => helpers}/NodeData.java (95%) rename community/kernel-api/src/test/java/org/neo4j/internal/kernel/api/{ => helpers}/StubNodeCursor.java (92%) rename community/kernel-api/src/test/java/org/neo4j/internal/kernel/api/{ => helpers}/StubNodeLabelIndexCursor.java (90%) rename community/kernel-api/src/test/java/org/neo4j/internal/kernel/api/{ => helpers}/StubPropertyCursor.java (97%) rename community/kernel-api/src/test/java/org/neo4j/internal/kernel/api/{ => helpers}/StubRead.java (87%) diff --git a/community/kernel-api/src/test/java/org/neo4j/internal/kernel/api/NodeData.java b/community/kernel-api/src/test/java/org/neo4j/internal/kernel/api/helpers/NodeData.java similarity index 95% rename from community/kernel-api/src/test/java/org/neo4j/internal/kernel/api/NodeData.java rename to community/kernel-api/src/test/java/org/neo4j/internal/kernel/api/helpers/NodeData.java index 79b1eb3c945c3..917fa83b8004e 100644 --- a/community/kernel-api/src/test/java/org/neo4j/internal/kernel/api/NodeData.java +++ b/community/kernel-api/src/test/java/org/neo4j/internal/kernel/api/helpers/NodeData.java @@ -17,10 +17,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.internal.kernel.api; +package org.neo4j.internal.kernel.api.helpers; import java.util.Map; +import org.neo4j.internal.kernel.api.LabelSet; import org.neo4j.values.storable.Value; class NodeData diff --git a/community/kernel-api/src/test/java/org/neo4j/internal/kernel/api/StubNodeCursor.java b/community/kernel-api/src/test/java/org/neo4j/internal/kernel/api/helpers/StubNodeCursor.java similarity index 92% rename from community/kernel-api/src/test/java/org/neo4j/internal/kernel/api/StubNodeCursor.java rename to community/kernel-api/src/test/java/org/neo4j/internal/kernel/api/helpers/StubNodeCursor.java index 1af351ec71037..92ba1cfb1493d 100644 --- a/community/kernel-api/src/test/java/org/neo4j/internal/kernel/api/StubNodeCursor.java +++ b/community/kernel-api/src/test/java/org/neo4j/internal/kernel/api/helpers/StubNodeCursor.java @@ -17,13 +17,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.internal.kernel.api; +package org.neo4j.internal.kernel.api.helpers; import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Map; +import org.neo4j.internal.kernel.api.LabelSet; +import org.neo4j.internal.kernel.api.NodeCursor; +import org.neo4j.internal.kernel.api.PropertyCursor; +import org.neo4j.internal.kernel.api.RelationshipGroupCursor; +import org.neo4j.internal.kernel.api.RelationshipTraversalCursor; import org.neo4j.values.storable.Value; public class StubNodeCursor implements NodeCursor diff --git a/community/kernel-api/src/test/java/org/neo4j/internal/kernel/api/StubNodeLabelIndexCursor.java b/community/kernel-api/src/test/java/org/neo4j/internal/kernel/api/helpers/StubNodeLabelIndexCursor.java similarity index 90% rename from community/kernel-api/src/test/java/org/neo4j/internal/kernel/api/StubNodeLabelIndexCursor.java rename to community/kernel-api/src/test/java/org/neo4j/internal/kernel/api/helpers/StubNodeLabelIndexCursor.java index 1349dcead070b..cb77e379ed6b6 100644 --- a/community/kernel-api/src/test/java/org/neo4j/internal/kernel/api/StubNodeLabelIndexCursor.java +++ b/community/kernel-api/src/test/java/org/neo4j/internal/kernel/api/helpers/StubNodeLabelIndexCursor.java @@ -17,10 +17,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.internal.kernel.api; +package org.neo4j.internal.kernel.api.helpers; import java.util.Map; +import org.neo4j.internal.kernel.api.LabelSet; +import org.neo4j.internal.kernel.api.NodeCursor; +import org.neo4j.internal.kernel.api.NodeLabelIndexCursor; + public class StubNodeLabelIndexCursor implements NodeLabelIndexCursor { private int offset = -1; diff --git a/community/kernel-api/src/test/java/org/neo4j/internal/kernel/api/StubPropertyCursor.java b/community/kernel-api/src/test/java/org/neo4j/internal/kernel/api/helpers/StubPropertyCursor.java similarity index 97% rename from community/kernel-api/src/test/java/org/neo4j/internal/kernel/api/StubPropertyCursor.java rename to community/kernel-api/src/test/java/org/neo4j/internal/kernel/api/helpers/StubPropertyCursor.java index 82a576b90378d..8f7a048780855 100644 --- a/community/kernel-api/src/test/java/org/neo4j/internal/kernel/api/StubPropertyCursor.java +++ b/community/kernel-api/src/test/java/org/neo4j/internal/kernel/api/helpers/StubPropertyCursor.java @@ -17,11 +17,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.internal.kernel.api; +package org.neo4j.internal.kernel.api.helpers; import java.util.Map; import java.util.regex.Pattern; +import org.neo4j.internal.kernel.api.PropertyCursor; import org.neo4j.values.storable.Value; import org.neo4j.values.storable.ValueGroup; import org.neo4j.values.storable.ValueWriter; diff --git a/community/kernel-api/src/test/java/org/neo4j/internal/kernel/api/StubRead.java b/community/kernel-api/src/test/java/org/neo4j/internal/kernel/api/helpers/StubRead.java similarity index 87% rename from community/kernel-api/src/test/java/org/neo4j/internal/kernel/api/StubRead.java rename to community/kernel-api/src/test/java/org/neo4j/internal/kernel/api/helpers/StubRead.java index 5726850eb44eb..859a104df8d3a 100644 --- a/community/kernel-api/src/test/java/org/neo4j/internal/kernel/api/StubRead.java +++ b/community/kernel-api/src/test/java/org/neo4j/internal/kernel/api/helpers/StubRead.java @@ -17,8 +17,20 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.internal.kernel.api; - +package org.neo4j.internal.kernel.api.helpers; + +import org.neo4j.internal.kernel.api.IndexOrder; +import org.neo4j.internal.kernel.api.IndexQuery; +import org.neo4j.internal.kernel.api.IndexReference; +import org.neo4j.internal.kernel.api.NodeCursor; +import org.neo4j.internal.kernel.api.NodeLabelIndexCursor; +import org.neo4j.internal.kernel.api.NodeValueIndexCursor; +import org.neo4j.internal.kernel.api.PropertyCursor; +import org.neo4j.internal.kernel.api.Read; +import org.neo4j.internal.kernel.api.RelationshipGroupCursor; +import org.neo4j.internal.kernel.api.RelationshipScanCursor; +import org.neo4j.internal.kernel.api.RelationshipTraversalCursor; +import org.neo4j.internal.kernel.api.Scan; import org.neo4j.internal.kernel.api.exceptions.KernelException; public class StubRead implements Read diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/newapi/IndexTxStateUpdaterTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/newapi/IndexTxStateUpdaterTest.java index 084e221abe53d..5a39b0ffd7981 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/newapi/IndexTxStateUpdaterTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/newapi/IndexTxStateUpdaterTest.java @@ -26,8 +26,8 @@ import java.util.HashMap; import java.util.List; -import org.neo4j.internal.kernel.api.StubNodeCursor; -import org.neo4j.internal.kernel.api.StubPropertyCursor; +import org.neo4j.internal.kernel.api.helpers.StubNodeCursor; +import org.neo4j.internal.kernel.api.helpers.StubPropertyCursor; import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor; import org.neo4j.kernel.api.exceptions.EntityNotFoundException; import org.neo4j.kernel.api.schema.index.IndexDescriptor; diff --git a/enterprise/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiled_runtime/v3_4/codegen/CodeGeneratorTest.scala b/enterprise/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiled_runtime/v3_4/codegen/CodeGeneratorTest.scala index d8f6715e29579..4d1bd1284409f 100644 --- a/enterprise/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiled_runtime/v3_4/codegen/CodeGeneratorTest.scala +++ b/enterprise/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiled_runtime/v3_4/codegen/CodeGeneratorTest.scala @@ -32,7 +32,6 @@ import org.neo4j.cypher.internal.compatibility.v3_4.runtime.compiled.codegen.{By import org.neo4j.cypher.internal.compiler.v3_4.planner.LogicalPlanningTestSupport import org.neo4j.cypher.internal.frontend.v3_4.semantics.SemanticTable import org.neo4j.cypher.internal.planner.v3_4.spi.CostBasedPlannerName -import org.neo4j.cypher.internal.planner.v3_4.spi.PlanningAttributes.{Cardinalities, ReadOnlies} import org.neo4j.cypher.internal.runtime.interpreted.TransactionalContextWrapper import org.neo4j.cypher.internal.runtime.{InternalExecutionResult, NormalMode, QueryContext} import org.neo4j.cypher.internal.spi.v3_4.codegen.GeneratedQueryStructure @@ -45,6 +44,7 @@ import org.neo4j.cypher.internal.v3_4.logical.plans.{Ascending, Descending, _} import org.neo4j.graphdb.Result.{ResultRow, ResultVisitor} import org.neo4j.graphdb._ import org.neo4j.internal.kernel.api._ +import org.neo4j.internal.kernel.api.helpers.{StubNodeCursor, StubNodeLabelIndexCursor, StubPropertyCursor, StubRead} import org.neo4j.kernel.api.ReadOperations import org.neo4j.kernel.impl.api.RelationshipVisitor import org.neo4j.kernel.impl.api.store.RelationshipIterator diff --git a/enterprise/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiled_runtime/v3_4/codegen/ir/BuildProbeTableInstructionsTest.scala b/enterprise/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiled_runtime/v3_4/codegen/ir/BuildProbeTableInstructionsTest.scala index 6ba2d8a6aaa4b..4f8a49451c2da 100644 --- a/enterprise/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiled_runtime/v3_4/codegen/ir/BuildProbeTableInstructionsTest.scala +++ b/enterprise/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiled_runtime/v3_4/codegen/ir/BuildProbeTableInstructionsTest.scala @@ -38,6 +38,7 @@ import org.neo4j.cypher.internal.util.v3_4.attribution.Id import org.neo4j.cypher.internal.util.v3_4.test_helpers.CypherFunSuite import org.neo4j.graphdb.Node import org.neo4j.internal.kernel.api._ +import org.neo4j.internal.kernel.api.helpers.StubNodeCursor import org.neo4j.kernel.api.ReadOperations import org.neo4j.kernel.impl.core.{EmbeddedProxySPI, NodeProxy} import org.neo4j.values.AnyValue diff --git a/enterprise/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiled_runtime/v3_4/codegen/ir/CompiledProfilingTest.scala b/enterprise/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiled_runtime/v3_4/codegen/ir/CompiledProfilingTest.scala index 12bd354c75d97..7df2e765ae5a7 100644 --- a/enterprise/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiled_runtime/v3_4/codegen/ir/CompiledProfilingTest.scala +++ b/enterprise/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiled_runtime/v3_4/codegen/ir/CompiledProfilingTest.scala @@ -31,14 +31,15 @@ import org.neo4j.cypher.internal.runtime.interpreted.TransactionalContextWrapper import org.neo4j.cypher.internal.runtime.planDescription.InternalPlanDescription.Arguments.{DbHits, Rows} import org.neo4j.cypher.internal.runtime.planDescription.{InternalPlanDescription, NoChildren, PlanDescriptionImpl, SingleChild} import org.neo4j.cypher.internal.runtime.{ProfileMode, QueryContext, QueryTransactionalContext} -import org.neo4j.cypher.internal.util.v3_4.attribution.{Id, SequentialIdGen} +import org.neo4j.cypher.internal.util.v3_4.attribution.Id import org.neo4j.cypher.internal.util.v3_4.test_helpers.CypherFunSuite import org.neo4j.cypher.internal.v3_4.codegen.profiling.ProfilingTracer import org.neo4j.cypher.internal.v3_4.expressions.SignedDecimalIntegerLiteral import org.neo4j.cypher.internal.v3_4.logical.plans import org.neo4j.cypher.internal.v3_4.logical.plans._ +import org.neo4j.internal.kernel.api.CursorFactory import org.neo4j.internal.kernel.api.Transaction.Type -import org.neo4j.internal.kernel.api.{CursorFactory, StubNodeCursor, StubRead} +import org.neo4j.internal.kernel.api.helpers.{StubNodeCursor, StubRead} import org.neo4j.io.pagecache.tracing.cursor.DefaultPageCursorTracer import org.neo4j.kernel.api.security.AnonymousContext import org.neo4j.kernel.impl.core.{EmbeddedProxySPI, NodeProxy}