fixing tests due to low cohesion

Author: lassewesth

procedures/extension/src/main/java/org/neo4j/gds/extension/OpenGraphDataScienceExtension.java

@@ -57,6 +57,8 @@ public OpenGraphDataScienceExtension() {
     @Override
     public Lifecycle newInstance(ExtensionContext extensionContext, Dependencies dependencies) {
         var log = new LogAccessor().getLog(dependencies.logService(), getClass());
+
+        var dependencySatisfier = extensionContext.dependencySatisfier();
         var globalProcedures = dependencies.globalProcedures();
         var neo4jConfiguration = dependencies.config();
 
@@ -77,6 +79,7 @@ public Lifecycle newInstance(ExtensionContext extensionContext, Dependencies dep
 
         var graphDataScienceExtensionBuilderAndAssociatedProducts = OpenGraphDataScienceExtensionBuilder.create(
             log,
+            dependencySatisfier,
             globalProcedures,
             neo4jConfiguration,
             concurrencyValidator,

procedures/integration/src/main/java/org/neo4j/gds/procedures/integration/ComponentRegistration.java

@@ -19,6 +19,7 @@
  */
 package org.neo4j.gds.procedures.integration;
 
+import org.neo4j.common.DependencySatisfier;
 import org.neo4j.function.ThrowingFunction;
 import org.neo4j.gds.logging.Log;
 import org.neo4j.internal.kernel.api.exceptions.ProcedureException;
@@ -27,10 +28,12 @@
 
 public class ComponentRegistration {
     private final Log log;
+    private final DependencySatisfier dependencySatisfier;
     private final GlobalProcedures globalProcedures;
 
-    public ComponentRegistration(Log log, GlobalProcedures globalProcedures) {
+    public ComponentRegistration(Log log, DependencySatisfier dependencySatisfier, GlobalProcedures globalProcedures) {
         this.log = log;
+        this.dependencySatisfier = dependencySatisfier;
         this.globalProcedures = globalProcedures;
     }
 
@@ -47,4 +50,8 @@ public <T> void registerComponent(
         );
         log.info(name + " registered.");
     }
+
+    void setUpDependency(Object component) {
+        dependencySatisfier.satisfyDependency(component);
+    }
 }

procedures/integration/src/main/java/org/neo4j/gds/procedures/integration/OpenGraphDataScienceExtensionBuilder.java

@@ -20,6 +20,7 @@
 package org.neo4j.gds.procedures.integration;
 
 import org.apache.commons.lang3.tuple.Triple;
+import org.neo4j.common.DependencySatisfier;
 import org.neo4j.gds.applications.algorithms.machinery.AlgorithmProcessingTemplate;
 import org.neo4j.gds.applications.graphstorecatalog.ExportLocation;
 import org.neo4j.gds.applications.graphstorecatalog.GraphCatalogApplications;
@@ -115,6 +116,7 @@ private OpenGraphDataScienceExtensionBuilder(
      */
     public static Triple<OpenGraphDataScienceExtensionBuilder, TaskRegistryFactoryService, TaskStoreService> create(
         Log log,
+        DependencySatisfier dependencySatisfier,
         GlobalProcedures globalProcedures,
         Configuration neo4jConfiguration,
         ConcurrencyValidator concurrencyValidator,
@@ -169,7 +171,7 @@ public static Triple<OpenGraphDataScienceExtensionBuilder, TaskRegistryFactorySe
             freeMemoryAfterLastGc
         );
 
-        var componentRegistration = new ComponentRegistration(log, globalProcedures);
+        var componentRegistration = new ComponentRegistration(log, dependencySatisfier, globalProcedures);
 
         componentRegistration.registerComponent("GDS Memory Facade", MemoryFacade.class, context -> {
              var userAccessor = new UserAccessor();
@@ -265,6 +267,8 @@ private void registerMetricsComponent(Metrics metrics) {
     @Deprecated
     private void registerModelCatalogComponent(ModelCatalog modelCatalog) {
         componentRegistration.registerComponent("Model Catalog", ModelCatalog.class, __ -> modelCatalog);
+
+        componentRegistration.setUpDependency(modelCatalog);
     }
 
     /**