Extract procedures-facade-api module

vnickolov · vnickolov · commit aa43c65cc272 · 2024-10-21T16:00:20.000+01:00
diff --git a/alpha/alpha-proc/build.gradle b/alpha/alpha-proc/build.gradle
@@ -36,7 +36,10 @@ dependencies {
     implementation project(':memory-usage')
     implementation project(':neo4j-api')
     implementation project(':operations-procedure-facade')
-    implementation project(':opengds-procedure-facade')
+
+//    implementation project(':opengds-procedure-facade')
+    implementation project(':procedures-facade-api')
+
     implementation project(':pregel')
     implementation project(':proc-catalog')
     implementation project(':proc-pregel')
@@ -57,4 +60,5 @@ dependencies {
     testImplementation openGds.mockito.junit.jupiter
 
     testImplementation project(':opengds-extension')
+    testImplementation project(':opengds-procedure-facade')
 }
diff --git a/proc/catalog/build.gradle b/proc/catalog/build.gradle
@@ -38,7 +38,9 @@ dependencies {
     implementation project(':native-projection')
     implementation project(':neo4j-api')
     implementation project(':neo4j-settings')
-    implementation project(':opengds-procedure-facade')
+//    implementation project(':opengds-procedure-facade')
+    implementation project(':procedures-facade-api')
+
     implementation project(':progress-tracking')
     implementation project(':proc-common')
     implementation project(':string-formatting')
diff --git a/proc/centrality/build.gradle b/proc/centrality/build.gradle
@@ -21,7 +21,10 @@ dependencies {
     implementation project(':executor')
     implementation project(':logging')
     implementation project(':neo4j-api')
-    implementation project(':opengds-procedure-facade')
+
+//    implementation project(':opengds-procedure-facade')
+    implementation project(':procedures-facade-api')
+
     implementation project(':pregel')
     implementation project(':proc-common')
     implementation project(':progress-tracking')
diff --git a/proc/common/build.gradle b/proc/common/build.gradle
@@ -39,10 +39,12 @@ dependencies {
     implementation project(':model-catalog-api')
     implementation project(':neo4j-api')
     implementation project(':neo4j-log-adapter')
+    // this is needed because of `TransactionNodeLookup` 🙈
     implementation project(':opengds-procedure-facade')
     implementation project(':open-licensing')
     implementation project(':pregel')
     implementation project(':procedure-integration')
+    implementation project(':procedures-facade-api')
     implementation project(':progress-tracking')
     implementation project(':string-formatting')
     implementation project(':termination')
diff --git a/proc/common/src/main/java/org/neo4j/gds/BaseProc.java b/proc/common/src/main/java/org/neo4j/gds/BaseProc.java
@@ -31,7 +31,7 @@
 import org.neo4j.gds.procedures.GraphDataScienceProcedures;
 import org.neo4j.gds.procedures.ProcedureCallContextReturnColumns;
 import org.neo4j.gds.procedures.TransactionCloseableResourceRegistry;
-import org.neo4j.gds.procedures.TransactionNodeLookup;
+import org.neo4j.gds.transaction.TransactionNodeLookup;
 import org.neo4j.gds.termination.TransactionTerminationMonitor;
 import org.neo4j.gds.transaction.DatabaseTransactionContext;
 import org.neo4j.gds.transaction.EmptyTransactionContext;
diff --git a/proc/community/build.gradle b/proc/community/build.gradle
@@ -31,7 +31,10 @@ dependencies {
     implementation project(':model-catalog-procedure-facade')
     implementation project(':neo4j-api')
     implementation project(':node-embedding-algorithms')
-    implementation project(':opengds-procedure-facade')
+
+//    implementation project(':opengds-procedure-facade')
+    implementation project(':procedures-facade-api')
+
     implementation project(':operations-applications')
     implementation project(':operations-procedure-facade')
     implementation project(':pipelines-procedure-facade')
diff --git a/proc/embeddings/build.gradle b/proc/embeddings/build.gradle
@@ -23,7 +23,10 @@ dependencies {
     implementation project(':ml-core')
     implementation project(':graph-schema-api')
     implementation project(':model-catalog-api')
-    implementation project(':opengds-procedure-facade')
+
+//    implementation project(':opengds-procedure-facade')
+    implementation project(':procedures-facade-api')
+
     implementation project(':progress-tracking')
     implementation project(':proc-common')
     implementation project(':string-formatting')
diff --git a/proc/machine-learning/build.gradle b/proc/machine-learning/build.gradle
@@ -50,7 +50,10 @@ dependencies {
     implementation project(':model-catalog-procedure-facade')
     implementation project(':neo4j-api')
     implementation project(':node-embedding-algorithms')
-    implementation project(':opengds-procedure-facade')
+
+//    implementation project(':opengds-procedure-facade')
+    implementation project(':procedures-facade-api')
+
     implementation project(':operations-applications')
     implementation project(':operations-procedure-facade')
     implementation project(':pipeline')
diff --git a/proc/misc/build.gradle b/proc/misc/build.gradle
@@ -19,7 +19,10 @@ dependencies {
     implementation project(':executor')
     implementation project(':logging')
     implementation project(':memory-usage')
-    implementation project(':opengds-procedure-facade')
+
+//    implementation project(':opengds-procedure-facade')
+    implementation project(':procedures-facade-api')
+
     implementation project(':operations-facade-api')
     implementation project(':proc-common')
     implementation project(':proc-embeddings')
diff --git a/proc/path-finding/build.gradle b/proc/path-finding/build.gradle
@@ -24,7 +24,10 @@ dependencies {
     implementation project(':logging')
     implementation project(':memory-usage')
     implementation project(':neo4j-api')
-    implementation project(':opengds-procedure-facade')
+
+//    implementation project(':opengds-procedure-facade')
+    implementation project(':procedures-facade-api')
+
     implementation project(':proc-common')
     implementation project(':path-finding-algorithms')
     implementation project(':progress-tracking')
diff --git a/proc/pipeline-catalog/build.gradle b/proc/pipeline-catalog/build.gradle
@@ -18,7 +18,10 @@ dependencies {
     implementation project(':annotations')
     implementation project(':config-api')
     implementation project(':executor')
-    implementation project(':opengds-procedure-facade')
+
+//    implementation project(':opengds-procedure-facade')
+    implementation project(':procedures-facade-api')
+
     implementation project(':pipeline')
     implementation project(':pipelines-facade-api')
     implementation project(':proc-common')
diff --git a/proc/similarity/build.gradle b/proc/similarity/build.gradle
@@ -23,7 +23,10 @@ dependencies {
     implementation project(':logging')
     implementation project(':memory-usage')
     implementation project(':neo4j-api')
-    implementation project(':opengds-procedure-facade')
+
+//    implementation project(':opengds-procedure-facade')
+    implementation project(':procedures-facade-api')
+
     implementation project(':proc-common')
     implementation project(':progress-tracking')
     implementation project(':string-formatting')
diff --git a/proc/test/build.gradle b/proc/test/build.gradle
@@ -42,6 +42,7 @@ dependencies {
     implementation project(':pipelines-procedure-facade')
     implementation project(':pregel')
     implementation project(':procedure-integration')
+    implementation project(':procedures-facade-api')
     implementation project(':progress-tracking')
     implementation project(':string-formatting')
     implementation project(':termination')
diff --git a/procedures/extension/build.gradle b/procedures/extension/build.gradle
@@ -40,6 +40,7 @@ dependencies {
     implementation project(':proc-catalog')
     implementation project(':proc-community')
     implementation project(':proc-sysinfo')
+    implementation project(':procedures-facade-api')
     implementation project(':procedure-integration')
     implementation project(':progress-tracking')
     implementation project(':subgraph-filtering')
diff --git a/procedures/facade/build.gradle b/procedures/facade/build.gradle
@@ -12,8 +12,9 @@ dependencies {
         [group: 'org.neo4j', name: 'neo4j-kernel', version: ver.'neo4j'],
     )
 
+    implementation project(':procedures-facade-api')
+
     // the necessary GDS things
-    implementation project(':algorithms-facade-api')
     implementation project(':algorithms-machinery')
     implementation project(':algorithms-procedure-facade')
     implementation project(':annotations')
@@ -23,24 +24,19 @@ dependencies {
     implementation project(':core-write')
     implementation project(':defaults-and-limits-configuration')
     implementation project(':executor')
-    api project(':graph-catalog-facade-api')
     implementation project(':graph-catalog-procedure-facade')
     implementation project(':graph-schema-api')
     implementation project(':graph-store-catalog-applications')
     implementation project(':logging')
     implementation project(':memory-estimation')
     implementation project(':memory-usage')
-    implementation project(':metrics-api')
     implementation project(':model-catalog-api')
     implementation project(':model-catalog-applications')
-    api project(':model-catalog-facade-api')
     implementation project(':model-catalog-procedure-facade')
     implementation project(':neo4j-api')
     implementation project(':operations-applications')
-    api project(':operations-facade-api')
     implementation project(':operations-procedure-facade')
     implementation project(':pipeline')
-    implementation project(':pipelines-facade-api')
     implementation project(':pipelines-procedure-facade')
     implementation project(':progress-tracking')
     implementation project(':string-formatting')
diff --git a/procedures/facade/src/main/java/org/neo4j/gds/procedures/AlgorithmsProcedureFacadeFactory.java b/procedures/facade/src/main/java/org/neo4j/gds/procedures/AlgorithmsProcedureFacadeFactory.java
@@ -33,6 +33,7 @@
 import org.neo4j.gds.procedures.algorithms.pathfinding.LocalPathFindingProcedureFacade;
 import org.neo4j.gds.procedures.algorithms.similarity.LocalSimilarityProcedureFacade;
 import org.neo4j.gds.procedures.algorithms.stubs.GenericStub;
+import org.neo4j.gds.transaction.TransactionNodeLookup;
 import org.neo4j.kernel.api.KernelTransaction;
 
 /**
diff --git a/procedures/facade/src/main/java/org/neo4j/gds/procedures/LocalGraphDataScienceProcedures.java b/procedures/facade/src/main/java/org/neo4j/gds/procedures/LocalGraphDataScienceProcedures.java
@@ -55,6 +55,7 @@
 import org.neo4j.gds.procedures.pipelines.PipelineRepository;
 import org.neo4j.gds.procedures.pipelines.PipelinesProcedureFacade;
 import org.neo4j.gds.termination.TerminationMonitor;
+import org.neo4j.gds.transaction.TransactionNodeLookup;
 import org.neo4j.graphdb.GraphDatabaseService;
 import org.neo4j.graphdb.Transaction;
 import org.neo4j.kernel.api.KernelTransaction;
diff --git a/procedures/integration/build.gradle b/procedures/integration/build.gradle
@@ -39,6 +39,7 @@ dependencies {
     implementation project(':opengds-procedure-facade')
     implementation project(':operations-applications')
     implementation project(':pipelines-procedure-facade')
+    implementation project(':procedures-facade-api')
     implementation project(':progress-tracking')
     implementation project(':string-formatting')
     implementation project(':termination')
diff --git a/procedures/procedures-facade-api/build.gradle b/procedures/procedures-facade-api/build.gradle
@@ -0,0 +1,25 @@
+apply plugin: 'java-library'
+
+description = 'Neo4j Graph Data Science :: Procedures Facade API'
+
+group = 'org.neo4j.gds'
+
+dependencies {
+    compileOnly(group: 'org.neo4j', name: 'neo4j-kernel-api', version: ver.'neo4j') { transitive = false }
+
+    api(
+        project(':graph-catalog-facade-api'),
+        project(':model-catalog-facade-api'),
+        project(':operations-facade-api'),
+        project(':logging'),
+        project(':pipelines-facade-api'),
+        project(':algorithms-facade-api'),
+        project(':metrics-api'),
+    )
+
+    // `User` is here 🙈
+    implementation project(':core')
+
+
+    implementation project(':neo4j-api')
+}
diff --git a/procedures/procedures-facade-api/src/main/java/org/neo4j/gds/procedures/GraphDataScienceProcedures.java b/procedures/procedures-facade-api/src/main/java/org/neo4j/gds/procedures/GraphDataScienceProcedures.java
diff --git a/procedures/procedures-facade-api/src/main/java/org/neo4j/gds/procedures/ProcedureCallContextReturnColumns.java b/procedures/procedures-facade-api/src/main/java/org/neo4j/gds/procedures/ProcedureCallContextReturnColumns.java
diff --git a/procedures/procedures-facade-api/src/main/java/org/neo4j/gds/procedures/ProcedureConstants.java b/procedures/procedures-facade-api/src/main/java/org/neo4j/gds/procedures/ProcedureConstants.java
diff --git a/procedures/procedures-facade-api/src/main/java/org/neo4j/gds/procedures/UserAccessor.java b/procedures/procedures-facade-api/src/main/java/org/neo4j/gds/procedures/UserAccessor.java
diff --git a/settings.gradle b/settings.gradle
@@ -403,6 +403,10 @@ project(':operations-facade-api').projectDir = file('procedures/operations-facad
 include('pipelines-facade-api')
 project(':pipelines-facade-api').projectDir = file('procedures/pipelines-facade-api')
 
+include('procedures-facade-api')
+project(':procedures-facade-api').projectDir = file('procedures/procedures-facade-api')
+
+
 include('neo4j-kernel-adapter-5.23')
 project(':neo4j-kernel-adapter-5.23').projectDir = file('compatibility/5.23/neo4j-kernel-adapter')
 
diff --git a/test-utils/build.gradle b/test-utils/build.gradle
@@ -35,6 +35,7 @@ dependencies {
     implementation project(':open-model-catalog')
     implementation project(':open-write-services')
     implementation project(':proc-common')
+    implementation project(':procedures-facade-api')
     implementation project(':progress-tracking')
     implementation project(':string-formatting')
     implementation project(':transaction')
diff --git a/transaction/src/main/java/org/neo4j/gds/transaction/TransactionNodeLookup.java b/transaction/src/main/java/org/neo4j/gds/transaction/TransactionNodeLookup.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.gds.procedures;
+package org.neo4j.gds.transaction;
 
 import org.neo4j.gds.api.NodeLookup;
 import org.neo4j.graphdb.Node;
