diff --git a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/valueHelper.scala b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/valueHelper.scala index 3e126d7d7604..e38535bae247 100644 --- a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/valueHelper.scala +++ b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/compatibility/valueHelper.scala @@ -21,7 +21,8 @@ package org.neo4j.cypher.internal.compatibility import java.util.function.BiConsumer -import org.neo4j.helpers.{NodeProxyWrappingNodeValue, RelationshipProxyWrappingEdgeValue} +import org.neo4j.helpers.RelationshipProxyWrappingEdgeValue +import org.neo4j.kernel.impl.util.NodeProxyWrappingNodeValue import org.neo4j.values.AnyValue import org.neo4j.values.storable._ import org.neo4j.values.virtual.{ListValue, MapValue} diff --git a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_3/TransactionBoundQueryContext.scala b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_3/TransactionBoundQueryContext.scala index a4cb0ba24a00..9dd8e1270f65 100644 --- a/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_3/TransactionBoundQueryContext.scala +++ b/community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_3/TransactionBoundQueryContext.scala @@ -46,7 +46,7 @@ import org.neo4j.graphdb.RelationshipType._ import org.neo4j.graphdb._ import org.neo4j.graphdb.security.URLAccessValidationError import org.neo4j.graphdb.traversal.{Evaluators, TraversalDescription, Uniqueness} -import org.neo4j.helpers.{NodeProxyWrappingNodeValue, RelationshipProxyWrappingEdgeValue} +import org.neo4j.helpers.RelationshipProxyWrappingEdgeValue import org.neo4j.kernel.GraphDatabaseQueryService import org.neo4j.kernel.api._ import org.neo4j.kernel.api.exceptions.ProcedureException @@ -60,6 +60,7 @@ import org.neo4j.kernel.impl.api.RelationshipVisitor import org.neo4j.kernel.impl.api.store.RelationshipIterator import org.neo4j.kernel.impl.core.{NodeManager, RelationshipProxy} import org.neo4j.kernel.impl.locking.ResourceTypes +import org.neo4j.kernel.impl.util.NodeProxyWrappingNodeValue import org.neo4j.values.AnyValue import org.neo4j.values.storable.{Value, Values} import org.neo4j.values.virtual.EdgeValue diff --git a/community/kernel/src/main/java/org/neo4j/helpers/NodeProxyWrappingNodeValue.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/util/NodeProxyWrappingNodeValue.java similarity index 97% rename from community/kernel/src/main/java/org/neo4j/helpers/NodeProxyWrappingNodeValue.java rename to community/kernel/src/main/java/org/neo4j/kernel/impl/util/NodeProxyWrappingNodeValue.java index d80a27632e76..e042e834d550 100644 --- a/community/kernel/src/main/java/org/neo4j/helpers/NodeProxyWrappingNodeValue.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/util/NodeProxyWrappingNodeValue.java @@ -17,14 +17,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.helpers; +package org.neo4j.kernel.impl.util; import java.util.ArrayList; import org.neo4j.graphdb.Label; import org.neo4j.graphdb.Node; import org.neo4j.graphdb.NotFoundException; -import org.neo4j.kernel.impl.util.ValueUtils; import org.neo4j.values.AnyValueWriter; import org.neo4j.values.storable.TextArray; import org.neo4j.values.storable.Values; diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/util/ValueUtils.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/util/ValueUtils.java index 77ffacd5d359..d204ac8bbda6 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/util/ValueUtils.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/util/ValueUtils.java @@ -34,7 +34,6 @@ import org.neo4j.graphdb.Relationship; import org.neo4j.graphdb.spatial.Geometry; import org.neo4j.graphdb.spatial.Point; -import org.neo4j.helpers.NodeProxyWrappingNodeValue; import org.neo4j.helpers.RelationshipProxyWrappingEdgeValue; import org.neo4j.helpers.collection.Iterables; import org.neo4j.values.AnyValue;