From b49172570854a772eb3f779a98f008f217114f21 Mon Sep 17 00:00:00 2001 From: Martin Junghanns Date: Thu, 2 Nov 2023 17:57:03 +0100 Subject: [PATCH] Rename package to legacycypherprojection --- .../neo4j/gds/linkprediction/LinkPredictionFunc.java | 2 +- .../graphstorecatalog/CatalogBusinessFacade.java | 2 +- .../CatalogConfigurationService.java | 2 +- .../graphstorecatalog/CypherProjectApplication.java | 4 ++-- .../DefaultCatalogBusinessFacade.java | 2 +- .../gds/core/GraphLoaderDirectionalityTest.java | 2 +- .../BatchLoadResult.java | 2 +- .../CountingCypherRecordLoader.java | 2 +- .../CypherFactory.java | 4 ++-- .../CypherLoadingUtils.java | 2 +- .../CypherNodeLoader.java | 2 +- .../CypherQueryEstimator.java | 2 +- .../CypherRecordLoader.java | 2 +- .../CypherRelationshipLoader.java | 2 +- .../GraphProjectCypherResult.java | 2 +- .../GraphProjectFromCypherConfig.java | 4 ++-- .../NodeSubscriber.java | 2 +- .../RelationshipSubscriber.java | 2 +- .../ResultCountingSubscriber.java | 2 +- .../CypherFactoryTest.java | 2 +- .../CypherQueryEstimatorTest.java | 2 +- .../GraphProjectFromCypherConfigTest.java | 12 ++++++------ .../memest/MemoryEstimationGraphConfigParser.java | 6 +++--- .../java/org/neo4j/gds/catalog/GraphProjectProc.java | 2 +- .../org/neo4j/gds/catalog/GraphProjectProcTest.java | 8 ++++---- .../catalog/FilterOnCypherGraphIntegrationTest.java | 2 +- .../neo4j/gds/procedures/catalog/CatalogFacade.java | 2 +- .../org/neo4j/gds/procedures/catalog/GraphInfo.java | 2 +- .../integration/CatalogFacadeProviderFactory.java | 2 +- .../main/java/org/neo4j/gds/GraphLoaderBuilders.java | 4 ++-- .../org/neo4j/gds/GraphProjectConfigBuilders.java | 8 ++++---- .../neo4j/gds/GraphProjectConfigBuildersTest.java | 8 ++++---- 32 files changed, 52 insertions(+), 52 deletions(-) rename legacy-cypher-projection/src/main/java/org/neo4j/gds/{cypherprojection => legacycypherprojection}/BatchLoadResult.java (95%) rename legacy-cypher-projection/src/main/java/org/neo4j/gds/{cypherprojection => legacycypherprojection}/CountingCypherRecordLoader.java (98%) rename legacy-cypher-projection/src/main/java/org/neo4j/gds/{cypherprojection => legacycypherprojection}/CypherFactory.java (98%) rename legacy-cypher-projection/src/main/java/org/neo4j/gds/{cypherprojection => legacycypherprojection}/CypherLoadingUtils.java (96%) rename legacy-cypher-projection/src/main/java/org/neo4j/gds/{cypherprojection => legacycypherprojection}/CypherNodeLoader.java (98%) rename legacy-cypher-projection/src/main/java/org/neo4j/gds/{cypherprojection => legacycypherprojection}/CypherQueryEstimator.java (98%) rename legacy-cypher-projection/src/main/java/org/neo4j/gds/{cypherprojection => legacycypherprojection}/CypherRecordLoader.java (99%) rename legacy-cypher-projection/src/main/java/org/neo4j/gds/{cypherprojection => legacycypherprojection}/CypherRelationshipLoader.java (99%) rename legacy-cypher-projection/src/main/java/org/neo4j/gds/{cypherprojection => legacycypherprojection}/GraphProjectCypherResult.java (97%) rename legacy-cypher-projection/src/main/java/org/neo4j/gds/{cypherprojection => legacycypherprojection}/GraphProjectFromCypherConfig.java (97%) rename legacy-cypher-projection/src/main/java/org/neo4j/gds/{cypherprojection => legacycypherprojection}/NodeSubscriber.java (99%) rename legacy-cypher-projection/src/main/java/org/neo4j/gds/{cypherprojection => legacycypherprojection}/RelationshipSubscriber.java (99%) rename legacy-cypher-projection/src/main/java/org/neo4j/gds/{cypherprojection => legacycypherprojection}/ResultCountingSubscriber.java (96%) rename legacy-cypher-projection/src/test/java/org/neo4j/gds/{cypherprojection => legacycypherprojection}/CypherFactoryTest.java (99%) rename legacy-cypher-projection/src/test/java/org/neo4j/gds/{cypherprojection => legacycypherprojection}/CypherQueryEstimatorTest.java (98%) rename legacy-cypher-projection/src/test/java/org/neo4j/gds/{cypherprojection => legacycypherprojection}/GraphProjectFromCypherConfigTest.java (83%) diff --git a/alpha/alpha-proc/src/main/java/org/neo4j/gds/linkprediction/LinkPredictionFunc.java b/alpha/alpha-proc/src/main/java/org/neo4j/gds/linkprediction/LinkPredictionFunc.java index c798d596c1..518f236055 100644 --- a/alpha/alpha-proc/src/main/java/org/neo4j/gds/linkprediction/LinkPredictionFunc.java +++ b/alpha/alpha-proc/src/main/java/org/neo4j/gds/linkprediction/LinkPredictionFunc.java @@ -31,7 +31,7 @@ import java.util.Map; import java.util.Set; -import static org.neo4j.gds.cypherprojection.GraphProjectFromCypherConfig.RELATIONSHIP_QUERY_KEY; +import static org.neo4j.gds.legacycypherprojection.GraphProjectFromCypherConfig.RELATIONSHIP_QUERY_KEY; import static org.neo4j.gds.core.ProcedureConstants.DIRECTION_KEY; public class LinkPredictionFunc extends BaseProc { diff --git a/applications/graph-store-catalog/src/main/java/org/neo4j/gds/applications/graphstorecatalog/CatalogBusinessFacade.java b/applications/graph-store-catalog/src/main/java/org/neo4j/gds/applications/graphstorecatalog/CatalogBusinessFacade.java index 2fc376dcd0..7029f859a3 100644 --- a/applications/graph-store-catalog/src/main/java/org/neo4j/gds/applications/graphstorecatalog/CatalogBusinessFacade.java +++ b/applications/graph-store-catalog/src/main/java/org/neo4j/gds/applications/graphstorecatalog/CatalogBusinessFacade.java @@ -33,7 +33,7 @@ import org.neo4j.gds.core.write.NodePropertyExporterBuilder; import org.neo4j.gds.core.write.RelationshipExporterBuilder; import org.neo4j.gds.core.write.RelationshipPropertiesExporterBuilder; -import org.neo4j.gds.cypherprojection.GraphProjectCypherResult; +import org.neo4j.gds.legacycypherprojection.GraphProjectCypherResult; import org.neo4j.gds.projection.GraphProjectNativeResult; import org.neo4j.gds.results.MemoryEstimateResult; import org.neo4j.gds.transaction.TransactionContext; diff --git a/applications/graph-store-catalog/src/main/java/org/neo4j/gds/applications/graphstorecatalog/CatalogConfigurationService.java b/applications/graph-store-catalog/src/main/java/org/neo4j/gds/applications/graphstorecatalog/CatalogConfigurationService.java index 545b754c76..95ea902c94 100644 --- a/applications/graph-store-catalog/src/main/java/org/neo4j/gds/applications/graphstorecatalog/CatalogConfigurationService.java +++ b/applications/graph-store-catalog/src/main/java/org/neo4j/gds/applications/graphstorecatalog/CatalogConfigurationService.java @@ -35,7 +35,7 @@ import org.neo4j.gds.core.CypherMapAccess; import org.neo4j.gds.core.CypherMapWrapper; import org.neo4j.gds.core.loading.GraphStoreWithConfig; -import org.neo4j.gds.cypherprojection.GraphProjectFromCypherConfig; +import org.neo4j.gds.legacycypherprojection.GraphProjectFromCypherConfig; import org.neo4j.gds.graphsampling.config.CommonNeighbourAwareRandomWalkConfig; import org.neo4j.gds.projection.GraphProjectFromStoreConfig; diff --git a/applications/graph-store-catalog/src/main/java/org/neo4j/gds/applications/graphstorecatalog/CypherProjectApplication.java b/applications/graph-store-catalog/src/main/java/org/neo4j/gds/applications/graphstorecatalog/CypherProjectApplication.java index 3972c7eeda..8b4d69f57a 100644 --- a/applications/graph-store-catalog/src/main/java/org/neo4j/gds/applications/graphstorecatalog/CypherProjectApplication.java +++ b/applications/graph-store-catalog/src/main/java/org/neo4j/gds/applications/graphstorecatalog/CypherProjectApplication.java @@ -24,8 +24,8 @@ import org.neo4j.gds.core.utils.TerminationFlag; import org.neo4j.gds.core.utils.progress.TaskRegistryFactory; import org.neo4j.gds.core.utils.warnings.UserLogRegistryFactory; -import org.neo4j.gds.cypherprojection.GraphProjectCypherResult; -import org.neo4j.gds.cypherprojection.GraphProjectFromCypherConfig; +import org.neo4j.gds.legacycypherprojection.GraphProjectCypherResult; +import org.neo4j.gds.legacycypherprojection.GraphProjectFromCypherConfig; import org.neo4j.gds.results.MemoryEstimateResult; import org.neo4j.gds.transaction.TransactionContext; import org.neo4j.graphdb.GraphDatabaseService; diff --git a/applications/graph-store-catalog/src/main/java/org/neo4j/gds/applications/graphstorecatalog/DefaultCatalogBusinessFacade.java b/applications/graph-store-catalog/src/main/java/org/neo4j/gds/applications/graphstorecatalog/DefaultCatalogBusinessFacade.java index 45b89e9553..003a790cdf 100644 --- a/applications/graph-store-catalog/src/main/java/org/neo4j/gds/applications/graphstorecatalog/DefaultCatalogBusinessFacade.java +++ b/applications/graph-store-catalog/src/main/java/org/neo4j/gds/applications/graphstorecatalog/DefaultCatalogBusinessFacade.java @@ -39,7 +39,7 @@ import org.neo4j.gds.core.write.NodePropertyExporterBuilder; import org.neo4j.gds.core.write.RelationshipExporterBuilder; import org.neo4j.gds.core.write.RelationshipPropertiesExporterBuilder; -import org.neo4j.gds.cypherprojection.GraphProjectCypherResult; +import org.neo4j.gds.legacycypherprojection.GraphProjectCypherResult; import org.neo4j.gds.graphsampling.RandomWalkBasedNodesSampler; import org.neo4j.gds.graphsampling.config.RandomWalkWithRestartsConfig; import org.neo4j.gds.logging.Log; diff --git a/core/src/test/java/org/neo4j/gds/core/GraphLoaderDirectionalityTest.java b/core/src/test/java/org/neo4j/gds/core/GraphLoaderDirectionalityTest.java index 1336addb13..93f9d74b60 100644 --- a/core/src/test/java/org/neo4j/gds/core/GraphLoaderDirectionalityTest.java +++ b/core/src/test/java/org/neo4j/gds/core/GraphLoaderDirectionalityTest.java @@ -24,7 +24,7 @@ import org.neo4j.gds.Orientation; import org.neo4j.gds.StoreLoaderBuilder; import org.neo4j.gds.api.Graph; -import org.neo4j.gds.cypherprojection.GraphProjectFromCypherConfig; +import org.neo4j.gds.legacycypherprojection.GraphProjectFromCypherConfig; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.neo4j.gds.GraphFactoryTestSupport.AllGraphStoreFactoryTypesTest; diff --git a/legacy-cypher-projection/src/main/java/org/neo4j/gds/cypherprojection/BatchLoadResult.java b/legacy-cypher-projection/src/main/java/org/neo4j/gds/legacycypherprojection/BatchLoadResult.java similarity index 95% rename from legacy-cypher-projection/src/main/java/org/neo4j/gds/cypherprojection/BatchLoadResult.java rename to legacy-cypher-projection/src/main/java/org/neo4j/gds/legacycypherprojection/BatchLoadResult.java index 9c43cf9ed1..dc36329bea 100644 --- a/legacy-cypher-projection/src/main/java/org/neo4j/gds/cypherprojection/BatchLoadResult.java +++ b/legacy-cypher-projection/src/main/java/org/neo4j/gds/legacycypherprojection/BatchLoadResult.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.gds.cypherprojection; +package org.neo4j.gds.legacycypherprojection; class BatchLoadResult { diff --git a/legacy-cypher-projection/src/main/java/org/neo4j/gds/cypherprojection/CountingCypherRecordLoader.java b/legacy-cypher-projection/src/main/java/org/neo4j/gds/legacycypherprojection/CountingCypherRecordLoader.java similarity index 98% rename from legacy-cypher-projection/src/main/java/org/neo4j/gds/cypherprojection/CountingCypherRecordLoader.java rename to legacy-cypher-projection/src/main/java/org/neo4j/gds/legacycypherprojection/CountingCypherRecordLoader.java index 815389d3dd..24dcf8442d 100644 --- a/legacy-cypher-projection/src/main/java/org/neo4j/gds/cypherprojection/CountingCypherRecordLoader.java +++ b/legacy-cypher-projection/src/main/java/org/neo4j/gds/legacycypherprojection/CountingCypherRecordLoader.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.gds.cypherprojection; +package org.neo4j.gds.legacycypherprojection; import org.neo4j.gds.api.GraphLoaderContext; import org.neo4j.graphdb.security.AuthorizationViolationException; diff --git a/legacy-cypher-projection/src/main/java/org/neo4j/gds/cypherprojection/CypherFactory.java b/legacy-cypher-projection/src/main/java/org/neo4j/gds/legacycypherprojection/CypherFactory.java similarity index 98% rename from legacy-cypher-projection/src/main/java/org/neo4j/gds/cypherprojection/CypherFactory.java rename to legacy-cypher-projection/src/main/java/org/neo4j/gds/legacycypherprojection/CypherFactory.java index 087b3452a5..fa3e646575 100644 --- a/legacy-cypher-projection/src/main/java/org/neo4j/gds/cypherprojection/CypherFactory.java +++ b/legacy-cypher-projection/src/main/java/org/neo4j/gds/legacycypherprojection/CypherFactory.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.gds.cypherprojection; +package org.neo4j.gds.legacycypherprojection; import org.neo4j.gds.ElementProjection; import org.neo4j.gds.NodeLabel; @@ -48,7 +48,7 @@ import java.util.stream.Collectors; import java.util.stream.LongStream; -import static org.neo4j.gds.cypherprojection.CypherQueryEstimator.EstimationResult; +import static org.neo4j.gds.legacycypherprojection.CypherQueryEstimator.EstimationResult; import static org.neo4j.internal.kernel.api.security.AccessMode.Static.READ; public final class CypherFactory extends CSRGraphStoreFactory { diff --git a/legacy-cypher-projection/src/main/java/org/neo4j/gds/cypherprojection/CypherLoadingUtils.java b/legacy-cypher-projection/src/main/java/org/neo4j/gds/legacycypherprojection/CypherLoadingUtils.java similarity index 96% rename from legacy-cypher-projection/src/main/java/org/neo4j/gds/cypherprojection/CypherLoadingUtils.java rename to legacy-cypher-projection/src/main/java/org/neo4j/gds/legacycypherprojection/CypherLoadingUtils.java index dd34f704db..e63c79644f 100644 --- a/legacy-cypher-projection/src/main/java/org/neo4j/gds/cypherprojection/CypherLoadingUtils.java +++ b/legacy-cypher-projection/src/main/java/org/neo4j/gds/legacycypherprojection/CypherLoadingUtils.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.gds.cypherprojection; +package org.neo4j.gds.legacycypherprojection; import org.neo4j.kernel.impl.query.QueryExecutionKernelException; import org.neo4j.kernel.impl.query.QuerySubscription; diff --git a/legacy-cypher-projection/src/main/java/org/neo4j/gds/cypherprojection/CypherNodeLoader.java b/legacy-cypher-projection/src/main/java/org/neo4j/gds/legacycypherprojection/CypherNodeLoader.java similarity index 98% rename from legacy-cypher-projection/src/main/java/org/neo4j/gds/cypherprojection/CypherNodeLoader.java rename to legacy-cypher-projection/src/main/java/org/neo4j/gds/legacycypherprojection/CypherNodeLoader.java index 9a60d9d0ee..8c3621d4cf 100644 --- a/legacy-cypher-projection/src/main/java/org/neo4j/gds/cypherprojection/CypherNodeLoader.java +++ b/legacy-cypher-projection/src/main/java/org/neo4j/gds/legacycypherprojection/CypherNodeLoader.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.gds.cypherprojection; +package org.neo4j.gds.legacycypherprojection; import org.immutables.value.Value; import org.neo4j.gds.api.GraphLoaderContext; diff --git a/legacy-cypher-projection/src/main/java/org/neo4j/gds/cypherprojection/CypherQueryEstimator.java b/legacy-cypher-projection/src/main/java/org/neo4j/gds/legacycypherprojection/CypherQueryEstimator.java similarity index 98% rename from legacy-cypher-projection/src/main/java/org/neo4j/gds/cypherprojection/CypherQueryEstimator.java rename to legacy-cypher-projection/src/main/java/org/neo4j/gds/legacycypherprojection/CypherQueryEstimator.java index 92c8cdb951..6260aed208 100644 --- a/legacy-cypher-projection/src/main/java/org/neo4j/gds/cypherprojection/CypherQueryEstimator.java +++ b/legacy-cypher-projection/src/main/java/org/neo4j/gds/legacycypherprojection/CypherQueryEstimator.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.gds.cypherprojection; +package org.neo4j.gds.legacycypherprojection; import org.neo4j.gds.PropertyMapping; import org.neo4j.gds.annotation.ValueClass; diff --git a/legacy-cypher-projection/src/main/java/org/neo4j/gds/cypherprojection/CypherRecordLoader.java b/legacy-cypher-projection/src/main/java/org/neo4j/gds/legacycypherprojection/CypherRecordLoader.java similarity index 99% rename from legacy-cypher-projection/src/main/java/org/neo4j/gds/cypherprojection/CypherRecordLoader.java rename to legacy-cypher-projection/src/main/java/org/neo4j/gds/legacycypherprojection/CypherRecordLoader.java index 5e918caade..84c9de1723 100644 --- a/legacy-cypher-projection/src/main/java/org/neo4j/gds/cypherprojection/CypherRecordLoader.java +++ b/legacy-cypher-projection/src/main/java/org/neo4j/gds/legacycypherprojection/CypherRecordLoader.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.gds.cypherprojection; +package org.neo4j.gds.legacycypherprojection; import org.neo4j.gds.api.GraphLoaderContext; import org.neo4j.gds.compat.Neo4jProxy; diff --git a/legacy-cypher-projection/src/main/java/org/neo4j/gds/cypherprojection/CypherRelationshipLoader.java b/legacy-cypher-projection/src/main/java/org/neo4j/gds/legacycypherprojection/CypherRelationshipLoader.java similarity index 99% rename from legacy-cypher-projection/src/main/java/org/neo4j/gds/cypherprojection/CypherRelationshipLoader.java rename to legacy-cypher-projection/src/main/java/org/neo4j/gds/legacycypherprojection/CypherRelationshipLoader.java index 78720e755a..1e548cff9f 100644 --- a/legacy-cypher-projection/src/main/java/org/neo4j/gds/cypherprojection/CypherRelationshipLoader.java +++ b/legacy-cypher-projection/src/main/java/org/neo4j/gds/legacycypherprojection/CypherRelationshipLoader.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.gds.cypherprojection; +package org.neo4j.gds.legacycypherprojection; import org.eclipse.collections.impl.map.mutable.primitive.ObjectDoubleHashMap; import org.immutables.value.Value; diff --git a/legacy-cypher-projection/src/main/java/org/neo4j/gds/cypherprojection/GraphProjectCypherResult.java b/legacy-cypher-projection/src/main/java/org/neo4j/gds/legacycypherprojection/GraphProjectCypherResult.java similarity index 97% rename from legacy-cypher-projection/src/main/java/org/neo4j/gds/cypherprojection/GraphProjectCypherResult.java rename to legacy-cypher-projection/src/main/java/org/neo4j/gds/legacycypherprojection/GraphProjectCypherResult.java index f9568c90e5..1a33b99c29 100644 --- a/legacy-cypher-projection/src/main/java/org/neo4j/gds/cypherprojection/GraphProjectCypherResult.java +++ b/legacy-cypher-projection/src/main/java/org/neo4j/gds/legacycypherprojection/GraphProjectCypherResult.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.gds.cypherprojection; +package org.neo4j.gds.legacycypherprojection; import org.neo4j.gds.core.loading.GraphProjectResult; diff --git a/legacy-cypher-projection/src/main/java/org/neo4j/gds/cypherprojection/GraphProjectFromCypherConfig.java b/legacy-cypher-projection/src/main/java/org/neo4j/gds/legacycypherprojection/GraphProjectFromCypherConfig.java similarity index 97% rename from legacy-cypher-projection/src/main/java/org/neo4j/gds/cypherprojection/GraphProjectFromCypherConfig.java rename to legacy-cypher-projection/src/main/java/org/neo4j/gds/legacycypherprojection/GraphProjectFromCypherConfig.java index 453eadcbfd..91a096284e 100644 --- a/legacy-cypher-projection/src/main/java/org/neo4j/gds/cypherprojection/GraphProjectFromCypherConfig.java +++ b/legacy-cypher-projection/src/main/java/org/neo4j/gds/legacycypherprojection/GraphProjectFromCypherConfig.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.gds.cypherprojection; +package org.neo4j.gds.legacycypherprojection; import org.immutables.value.Value; import org.neo4j.gds.annotation.Configuration; @@ -66,7 +66,7 @@ public interface GraphProjectFromCypherConfig extends GraphProjectConfig { String relationshipQuery(); @Value.Default - @Configuration.ToMapValue("org.neo4j.gds.cypherprojection.GraphProjectFromCypherConfig#listParameterKeys") + @Configuration.ToMapValue("org.neo4j.gds.legacycypherprojection.GraphProjectFromCypherConfig#listParameterKeys") default Map parameters() { return Collections.emptyMap(); } diff --git a/legacy-cypher-projection/src/main/java/org/neo4j/gds/cypherprojection/NodeSubscriber.java b/legacy-cypher-projection/src/main/java/org/neo4j/gds/legacycypherprojection/NodeSubscriber.java similarity index 99% rename from legacy-cypher-projection/src/main/java/org/neo4j/gds/cypherprojection/NodeSubscriber.java rename to legacy-cypher-projection/src/main/java/org/neo4j/gds/legacycypherprojection/NodeSubscriber.java index 09a835014f..507248f791 100644 --- a/legacy-cypher-projection/src/main/java/org/neo4j/gds/cypherprojection/NodeSubscriber.java +++ b/legacy-cypher-projection/src/main/java/org/neo4j/gds/legacycypherprojection/NodeSubscriber.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.gds.cypherprojection; +package org.neo4j.gds.legacycypherprojection; import org.neo4j.gds.core.loading.ValueConverter; import org.neo4j.gds.core.loading.construction.NodeLabelTokens; diff --git a/legacy-cypher-projection/src/main/java/org/neo4j/gds/cypherprojection/RelationshipSubscriber.java b/legacy-cypher-projection/src/main/java/org/neo4j/gds/legacycypherprojection/RelationshipSubscriber.java similarity index 99% rename from legacy-cypher-projection/src/main/java/org/neo4j/gds/cypherprojection/RelationshipSubscriber.java rename to legacy-cypher-projection/src/main/java/org/neo4j/gds/legacycypherprojection/RelationshipSubscriber.java index e138ce35c7..561851f89a 100644 --- a/legacy-cypher-projection/src/main/java/org/neo4j/gds/cypherprojection/RelationshipSubscriber.java +++ b/legacy-cypher-projection/src/main/java/org/neo4j/gds/legacycypherprojection/RelationshipSubscriber.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.gds.cypherprojection; +package org.neo4j.gds.legacycypherprojection; import org.eclipse.collections.api.map.primitive.ObjectDoubleMap; import org.neo4j.gds.RelationshipType; diff --git a/legacy-cypher-projection/src/main/java/org/neo4j/gds/cypherprojection/ResultCountingSubscriber.java b/legacy-cypher-projection/src/main/java/org/neo4j/gds/legacycypherprojection/ResultCountingSubscriber.java similarity index 96% rename from legacy-cypher-projection/src/main/java/org/neo4j/gds/cypherprojection/ResultCountingSubscriber.java rename to legacy-cypher-projection/src/main/java/org/neo4j/gds/legacycypherprojection/ResultCountingSubscriber.java index a14da14ce8..f4e5b1f0f6 100644 --- a/legacy-cypher-projection/src/main/java/org/neo4j/gds/cypherprojection/ResultCountingSubscriber.java +++ b/legacy-cypher-projection/src/main/java/org/neo4j/gds/legacycypherprojection/ResultCountingSubscriber.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.gds.cypherprojection; +package org.neo4j.gds.legacycypherprojection; import org.neo4j.gds.core.utils.ErrorCachingQuerySubscriber; import org.neo4j.graphdb.QueryStatistics; diff --git a/legacy-cypher-projection/src/test/java/org/neo4j/gds/cypherprojection/CypherFactoryTest.java b/legacy-cypher-projection/src/test/java/org/neo4j/gds/legacycypherprojection/CypherFactoryTest.java similarity index 99% rename from legacy-cypher-projection/src/test/java/org/neo4j/gds/cypherprojection/CypherFactoryTest.java rename to legacy-cypher-projection/src/test/java/org/neo4j/gds/legacycypherprojection/CypherFactoryTest.java index be3a4320b0..ff79a851d4 100644 --- a/legacy-cypher-projection/src/test/java/org/neo4j/gds/cypherprojection/CypherFactoryTest.java +++ b/legacy-cypher-projection/src/test/java/org/neo4j/gds/legacycypherprojection/CypherFactoryTest.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.gds.cypherprojection; +package org.neo4j.gds.legacycypherprojection; import org.apache.commons.lang3.tuple.Pair; import org.eclipse.collections.api.block.function.Function; diff --git a/legacy-cypher-projection/src/test/java/org/neo4j/gds/cypherprojection/CypherQueryEstimatorTest.java b/legacy-cypher-projection/src/test/java/org/neo4j/gds/legacycypherprojection/CypherQueryEstimatorTest.java similarity index 98% rename from legacy-cypher-projection/src/test/java/org/neo4j/gds/cypherprojection/CypherQueryEstimatorTest.java rename to legacy-cypher-projection/src/test/java/org/neo4j/gds/legacycypherprojection/CypherQueryEstimatorTest.java index d7685e53b1..32e07e5408 100644 --- a/legacy-cypher-projection/src/test/java/org/neo4j/gds/cypherprojection/CypherQueryEstimatorTest.java +++ b/legacy-cypher-projection/src/test/java/org/neo4j/gds/legacycypherprojection/CypherQueryEstimatorTest.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.gds.cypherprojection; +package org.neo4j.gds.legacycypherprojection; import org.junit.jupiter.api.Test; import org.neo4j.gds.BaseTest; diff --git a/legacy-cypher-projection/src/test/java/org/neo4j/gds/cypherprojection/GraphProjectFromCypherConfigTest.java b/legacy-cypher-projection/src/test/java/org/neo4j/gds/legacycypherprojection/GraphProjectFromCypherConfigTest.java similarity index 83% rename from legacy-cypher-projection/src/test/java/org/neo4j/gds/cypherprojection/GraphProjectFromCypherConfigTest.java rename to legacy-cypher-projection/src/test/java/org/neo4j/gds/legacycypherprojection/GraphProjectFromCypherConfigTest.java index ada3ba6f9c..8ba3325dfe 100644 --- a/legacy-cypher-projection/src/test/java/org/neo4j/gds/cypherprojection/GraphProjectFromCypherConfigTest.java +++ b/legacy-cypher-projection/src/test/java/org/neo4j/gds/legacycypherprojection/GraphProjectFromCypherConfigTest.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.gds.cypherprojection; +package org.neo4j.gds.legacycypherprojection; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; @@ -35,11 +35,11 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import static org.neo4j.gds.cypherprojection.GraphProjectFromCypherConfig.ALL_NODES_QUERY; -import static org.neo4j.gds.cypherprojection.GraphProjectFromCypherConfig.ALL_RELATIONSHIPS_QUERY; -import static org.neo4j.gds.cypherprojection.GraphProjectFromCypherConfig.NODE_QUERY_KEY; -import static org.neo4j.gds.cypherprojection.GraphProjectFromCypherConfig.RELATIONSHIP_QUERY_KEY; -import static org.neo4j.gds.cypherprojection.GraphProjectFromCypherConfig.fromProcedureConfig; +import static org.neo4j.gds.legacycypherprojection.GraphProjectFromCypherConfig.ALL_NODES_QUERY; +import static org.neo4j.gds.legacycypherprojection.GraphProjectFromCypherConfig.ALL_RELATIONSHIPS_QUERY; +import static org.neo4j.gds.legacycypherprojection.GraphProjectFromCypherConfig.NODE_QUERY_KEY; +import static org.neo4j.gds.legacycypherprojection.GraphProjectFromCypherConfig.RELATIONSHIP_QUERY_KEY; +import static org.neo4j.gds.legacycypherprojection.GraphProjectFromCypherConfig.fromProcedureConfig; class GraphProjectFromCypherConfigTest { diff --git a/memory-estimation/src/main/java/org/neo4j/gds/memest/MemoryEstimationGraphConfigParser.java b/memory-estimation/src/main/java/org/neo4j/gds/memest/MemoryEstimationGraphConfigParser.java index bc645e33b4..d6b1b27450 100644 --- a/memory-estimation/src/main/java/org/neo4j/gds/memest/MemoryEstimationGraphConfigParser.java +++ b/memory-estimation/src/main/java/org/neo4j/gds/memest/MemoryEstimationGraphConfigParser.java @@ -21,14 +21,14 @@ import org.neo4j.gds.config.GraphProjectConfig; import org.neo4j.gds.core.CypherMapWrapper; -import org.neo4j.gds.cypherprojection.GraphProjectFromCypherConfig; +import org.neo4j.gds.legacycypherprojection.GraphProjectFromCypherConfig; import org.neo4j.gds.projection.GraphProjectFromStoreConfig; import org.neo4j.gds.utils.StringFormatting; import java.util.Map; -import static org.neo4j.gds.cypherprojection.GraphProjectFromCypherConfig.NODE_QUERY_KEY; -import static org.neo4j.gds.cypherprojection.GraphProjectFromCypherConfig.RELATIONSHIP_QUERY_KEY; +import static org.neo4j.gds.legacycypherprojection.GraphProjectFromCypherConfig.NODE_QUERY_KEY; +import static org.neo4j.gds.legacycypherprojection.GraphProjectFromCypherConfig.RELATIONSHIP_QUERY_KEY; import static org.neo4j.gds.projection.GraphProjectFromStoreConfig.NODE_PROJECTION_KEY; import static org.neo4j.gds.projection.GraphProjectFromStoreConfig.RELATIONSHIP_PROJECTION_KEY; diff --git a/proc/catalog/src/main/java/org/neo4j/gds/catalog/GraphProjectProc.java b/proc/catalog/src/main/java/org/neo4j/gds/catalog/GraphProjectProc.java index 39dfb82442..9d83095e09 100644 --- a/proc/catalog/src/main/java/org/neo4j/gds/catalog/GraphProjectProc.java +++ b/proc/catalog/src/main/java/org/neo4j/gds/catalog/GraphProjectProc.java @@ -21,7 +21,7 @@ import org.jetbrains.annotations.Nullable; import org.neo4j.gds.core.loading.GraphFilterResult; -import org.neo4j.gds.cypherprojection.GraphProjectCypherResult; +import org.neo4j.gds.legacycypherprojection.GraphProjectCypherResult; import org.neo4j.gds.procedures.GraphDataScience; import org.neo4j.gds.projection.GraphProjectNativeResult; import org.neo4j.gds.results.MemoryEstimateResult; diff --git a/proc/catalog/src/test/java/org/neo4j/gds/catalog/GraphProjectProcTest.java b/proc/catalog/src/test/java/org/neo4j/gds/catalog/GraphProjectProcTest.java index 4b129cc0cd..ce1668527b 100644 --- a/proc/catalog/src/test/java/org/neo4j/gds/catalog/GraphProjectProcTest.java +++ b/proc/catalog/src/test/java/org/neo4j/gds/catalog/GraphProjectProcTest.java @@ -80,10 +80,10 @@ import static org.neo4j.gds.TestSupport.assertGraphEquals; import static org.neo4j.gds.TestSupport.fromGdl; import static org.neo4j.gds.TestSupport.getCypherAggregation; -import static org.neo4j.gds.cypherprojection.GraphProjectFromCypherConfig.ALL_NODES_QUERY; -import static org.neo4j.gds.cypherprojection.GraphProjectFromCypherConfig.ALL_RELATIONSHIPS_QUERY; -import static org.neo4j.gds.cypherprojection.GraphProjectFromCypherConfig.NODE_QUERY_KEY; -import static org.neo4j.gds.cypherprojection.GraphProjectFromCypherConfig.RELATIONSHIP_QUERY_KEY; +import static org.neo4j.gds.legacycypherprojection.GraphProjectFromCypherConfig.ALL_NODES_QUERY; +import static org.neo4j.gds.legacycypherprojection.GraphProjectFromCypherConfig.ALL_RELATIONSHIPS_QUERY; +import static org.neo4j.gds.legacycypherprojection.GraphProjectFromCypherConfig.NODE_QUERY_KEY; +import static org.neo4j.gds.legacycypherprojection.GraphProjectFromCypherConfig.RELATIONSHIP_QUERY_KEY; import static org.neo4j.gds.projection.GraphProjectFromStoreConfig.NODE_PROJECTION_KEY; import static org.neo4j.gds.projection.GraphProjectFromStoreConfig.RELATIONSHIP_PROJECTION_KEY; import static org.neo4j.gds.utils.StringFormatting.formatWithLocale; diff --git a/proc/src/test/java/org/neo4j/gds/catalog/FilterOnCypherGraphIntegrationTest.java b/proc/src/test/java/org/neo4j/gds/catalog/FilterOnCypherGraphIntegrationTest.java index 4023da30f5..741dc30c41 100644 --- a/proc/src/test/java/org/neo4j/gds/catalog/FilterOnCypherGraphIntegrationTest.java +++ b/proc/src/test/java/org/neo4j/gds/catalog/FilterOnCypherGraphIntegrationTest.java @@ -31,7 +31,7 @@ import java.util.Map; import static org.junit.jupiter.api.Assertions.assertNotEquals; -import static org.neo4j.gds.cypherprojection.GraphProjectFromCypherConfig.ALL_RELATIONSHIPS_QUERY; +import static org.neo4j.gds.legacycypherprojection.GraphProjectFromCypherConfig.ALL_RELATIONSHIPS_QUERY; class FilterOnCypherGraphIntegrationTest extends BaseProcTest { diff --git a/procedures/facade/src/main/java/org/neo4j/gds/procedures/catalog/CatalogFacade.java b/procedures/facade/src/main/java/org/neo4j/gds/procedures/catalog/CatalogFacade.java index b333fd7048..e49a3a8311 100644 --- a/procedures/facade/src/main/java/org/neo4j/gds/procedures/catalog/CatalogFacade.java +++ b/procedures/facade/src/main/java/org/neo4j/gds/procedures/catalog/CatalogFacade.java @@ -51,7 +51,7 @@ import org.neo4j.gds.core.write.NodePropertyExporterBuilder; import org.neo4j.gds.core.write.RelationshipExporterBuilder; import org.neo4j.gds.core.write.RelationshipPropertiesExporterBuilder; -import org.neo4j.gds.cypherprojection.GraphProjectCypherResult; +import org.neo4j.gds.legacycypherprojection.GraphProjectCypherResult; import org.neo4j.gds.projection.GraphProjectNativeResult; import org.neo4j.gds.results.MemoryEstimateResult; import org.neo4j.gds.transaction.TransactionContext; diff --git a/procedures/facade/src/main/java/org/neo4j/gds/procedures/catalog/GraphInfo.java b/procedures/facade/src/main/java/org/neo4j/gds/procedures/catalog/GraphInfo.java index 1ebb51f46c..c076c15747 100644 --- a/procedures/facade/src/main/java/org/neo4j/gds/procedures/catalog/GraphInfo.java +++ b/procedures/facade/src/main/java/org/neo4j/gds/procedures/catalog/GraphInfo.java @@ -26,7 +26,7 @@ import org.neo4j.gds.config.GraphSampleProcConfig; import org.neo4j.gds.config.RandomGraphGeneratorConfig; import org.neo4j.gds.core.loading.DegreeDistribution; -import org.neo4j.gds.cypherprojection.GraphProjectFromCypherConfig; +import org.neo4j.gds.legacycypherprojection.GraphProjectFromCypherConfig; import org.neo4j.gds.mem.MemoryUsage; import org.neo4j.gds.projection.GraphProjectFromCypherAggregationConfig; import org.neo4j.gds.projection.GraphProjectFromStoreConfig; diff --git a/procedures/integration/src/main/java/org/neo4j/gds/procedures/integration/CatalogFacadeProviderFactory.java b/procedures/integration/src/main/java/org/neo4j/gds/procedures/integration/CatalogFacadeProviderFactory.java index 608ff0e922..cd74d63d1c 100644 --- a/procedures/integration/src/main/java/org/neo4j/gds/procedures/integration/CatalogFacadeProviderFactory.java +++ b/procedures/integration/src/main/java/org/neo4j/gds/procedures/integration/CatalogFacadeProviderFactory.java @@ -45,7 +45,7 @@ import org.neo4j.gds.applications.graphstorecatalog.WriteRelationshipsApplication; import org.neo4j.gds.beta.filter.GraphStoreFilterService; import org.neo4j.gds.core.loading.GraphStoreCatalogService; -import org.neo4j.gds.cypherprojection.GraphProjectCypherResult; +import org.neo4j.gds.legacycypherprojection.GraphProjectCypherResult; import org.neo4j.gds.logging.Log; import org.neo4j.gds.procedures.KernelTransactionAccessor; import org.neo4j.gds.procedures.ProcedureTransactionAccessor; diff --git a/test-utils/src/main/java/org/neo4j/gds/GraphLoaderBuilders.java b/test-utils/src/main/java/org/neo4j/gds/GraphLoaderBuilders.java index e91b078fdf..57189cc29f 100644 --- a/test-utils/src/main/java/org/neo4j/gds/GraphLoaderBuilders.java +++ b/test-utils/src/main/java/org/neo4j/gds/GraphLoaderBuilders.java @@ -34,7 +34,7 @@ import org.neo4j.gds.core.utils.progress.EmptyTaskRegistryFactory; import org.neo4j.gds.core.utils.progress.JobId; import org.neo4j.gds.core.utils.warnings.EmptyUserLogRegistryFactory; -import org.neo4j.gds.cypherprojection.GraphProjectFromCypherConfig; +import org.neo4j.gds.legacycypherprojection.GraphProjectFromCypherConfig; import org.neo4j.gds.projection.GraphProjectFromStoreConfig; import org.neo4j.gds.transaction.TransactionContext; import org.neo4j.graphdb.GraphDatabaseService; @@ -137,7 +137,7 @@ static GraphLoader storeLoaderWithConfig( /** * Factory method that defines the generation of a {@link GraphLoader} - * using a {@link org.neo4j.gds.cypherprojection.GraphProjectFromCypherConfig}. Use {@link CypherLoaderBuilder} + * using a {@link org.neo4j.gds.legacycypherprojection.GraphProjectFromCypherConfig}. Use {@link CypherLoaderBuilder} * to create the input for that method in a convenient way. */ @Builder.Factory diff --git a/test-utils/src/main/java/org/neo4j/gds/GraphProjectConfigBuilders.java b/test-utils/src/main/java/org/neo4j/gds/GraphProjectConfigBuilders.java index 0f2a80ec64..06171d79f7 100644 --- a/test-utils/src/main/java/org/neo4j/gds/GraphProjectConfigBuilders.java +++ b/test-utils/src/main/java/org/neo4j/gds/GraphProjectConfigBuilders.java @@ -24,8 +24,8 @@ import org.neo4j.gds.config.ConcurrencyConfig; import org.neo4j.gds.core.Aggregation; import org.neo4j.gds.core.utils.progress.JobId; -import org.neo4j.gds.cypherprojection.GraphProjectFromCypherConfig; -import org.neo4j.gds.cypherprojection.ImmutableGraphProjectFromCypherConfig; +import org.neo4j.gds.legacycypherprojection.GraphProjectFromCypherConfig; +import org.neo4j.gds.legacycypherprojection.ImmutableGraphProjectFromCypherConfig; import org.neo4j.gds.projection.GraphProjectFromStoreConfig; import org.neo4j.gds.projection.ImmutableGraphProjectFromStoreConfig; @@ -38,8 +38,8 @@ import static org.neo4j.gds.NodeLabel.ALL_NODES; import static org.neo4j.gds.RelationshipType.ALL_RELATIONSHIPS; -import static org.neo4j.gds.cypherprojection.GraphProjectFromCypherConfig.ALL_NODES_QUERY; -import static org.neo4j.gds.cypherprojection.GraphProjectFromCypherConfig.ALL_RELATIONSHIPS_QUERY; +import static org.neo4j.gds.legacycypherprojection.GraphProjectFromCypherConfig.ALL_NODES_QUERY; +import static org.neo4j.gds.legacycypherprojection.GraphProjectFromCypherConfig.ALL_RELATIONSHIPS_QUERY; @Value.Style(builderVisibility = Value.Style.BuilderVisibility.PUBLIC, depluralize = true, deepImmutablesDetection = true) public final class GraphProjectConfigBuilders { diff --git a/test-utils/src/test/java/org/neo4j/gds/GraphProjectConfigBuildersTest.java b/test-utils/src/test/java/org/neo4j/gds/GraphProjectConfigBuildersTest.java index 1844f4a679..4f030c4c2b 100644 --- a/test-utils/src/test/java/org/neo4j/gds/GraphProjectConfigBuildersTest.java +++ b/test-utils/src/test/java/org/neo4j/gds/GraphProjectConfigBuildersTest.java @@ -23,8 +23,8 @@ import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import org.neo4j.gds.api.DefaultValue; -import org.neo4j.gds.cypherprojection.GraphProjectFromCypherConfig; -import org.neo4j.gds.cypherprojection.ImmutableGraphProjectFromCypherConfig; +import org.neo4j.gds.legacycypherprojection.GraphProjectFromCypherConfig; +import org.neo4j.gds.legacycypherprojection.ImmutableGraphProjectFromCypherConfig; import org.neo4j.gds.core.Aggregation; import org.neo4j.gds.core.utils.progress.JobId; import org.neo4j.gds.projection.GraphProjectFromStoreConfig; @@ -36,8 +36,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.neo4j.gds.NodeLabel.ALL_NODES; import static org.neo4j.gds.RelationshipType.ALL_RELATIONSHIPS; -import static org.neo4j.gds.cypherprojection.GraphProjectFromCypherConfig.ALL_NODES_QUERY; -import static org.neo4j.gds.cypherprojection.GraphProjectFromCypherConfig.ALL_RELATIONSHIPS_QUERY; +import static org.neo4j.gds.legacycypherprojection.GraphProjectFromCypherConfig.ALL_NODES_QUERY; +import static org.neo4j.gds.legacycypherprojection.GraphProjectFromCypherConfig.ALL_RELATIONSHIPS_QUERY; class GraphProjectConfigBuildersTest {