fixing tests due to low cohesion

Author: lassewesth

procedures/extension/build.gradle

@@ -35,6 +35,7 @@ dependencies {
     implementation project(':neo4j-kernel-adapter-api')
     implementation project(':node-embedding-algorithms')
     implementation project(':opengds-procedure-facade')
+    implementation project(':open-licensing')
     implementation project(':open-model-catalog')
     implementation project(':operations-applications')
     implementation project(':path-finding-algorithms')

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

@@ -21,6 +21,7 @@
 
 import org.neo4j.annotations.service.ServiceProvider;
 import org.neo4j.configuration.Config;
+import org.neo4j.gds.OpenGdsLicenseState;
 import org.neo4j.gds.applications.operations.FeatureTogglesRepository;
 import org.neo4j.gds.concurrency.OpenGdsConcurrencyValidator;
 import org.neo4j.gds.concurrency.OpenGdsPoolSizes;
@@ -88,6 +89,7 @@ public Lifecycle newInstance(ExtensionContext extensionContext, Dependencies dep
             exportLocation,
             featureTogglesRepository,
             idMapBehavior,
+            OpenGdsLicenseState.INSTANCE,
             limitsConfiguration,
             metrics,
             modelCatalog,

procedures/integration/build.gradle

@@ -26,6 +26,7 @@ dependencies {
     implementation project(':executor')
     implementation project(':graph-store-catalog-applications')
     implementation project(':legacy-cypher-projection')
+    implementation project(':licensing')
     implementation project(':logging')
     implementation project(':memory-estimation')
     implementation project(':memory-facade')

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

@@ -21,6 +21,7 @@
 
 import org.apache.commons.lang3.tuple.Triple;
 import org.neo4j.common.DependencySatisfier;
+import org.neo4j.gds.LicenseState;
 import org.neo4j.gds.applications.algorithms.machinery.AlgorithmProcessingTemplate;
 import org.neo4j.gds.applications.graphstorecatalog.ExportLocation;
 import org.neo4j.gds.applications.graphstorecatalog.GraphCatalogApplications;
@@ -76,6 +77,7 @@ public final class OpenGraphDataScienceExtensionBuilder {
     private final GraphDataScienceProceduresProviderFactory graphDataScienceProceduresProviderFactory;
 
     // edition specifics
+    private final LicenseState licenseState;
     private final Metrics metrics;
     private final ModelCatalog modelCatalog;
 
@@ -90,6 +92,7 @@ private OpenGraphDataScienceExtensionBuilder(
         Log log,
         ComponentRegistration componentRegistration,
         GraphDataScienceProceduresProviderFactory graphDataScienceProceduresProviderFactory,
+        LicenseState licenseState,
         Metrics metrics,
         ModelCatalog modelCatalog,
         TaskStoreService taskStoreService,
@@ -101,6 +104,7 @@ private OpenGraphDataScienceExtensionBuilder(
         this.log = log;
         this.componentRegistration = componentRegistration;
         this.graphDataScienceProceduresProviderFactory = graphDataScienceProceduresProviderFactory;
+        this.licenseState = licenseState;
         this.metrics = metrics;
         this.modelCatalog = modelCatalog;
         this.taskStoreService = taskStoreService;
@@ -125,6 +129,7 @@ public static Triple<OpenGraphDataScienceExtensionBuilder, TaskRegistryFactorySe
         ExportLocation exportLocation,
         FeatureTogglesRepository featureTogglesRepository,
         IdMapBehavior idMapBehavior,
+        LicenseState licenseState,
         LimitsConfiguration limitsConfiguration,
         Metrics metrics,
         ModelCatalog modelCatalog,
@@ -200,6 +205,7 @@ public static Triple<OpenGraphDataScienceExtensionBuilder, TaskRegistryFactorySe
             log,
             componentRegistration,
             graphDataScienceProviderFactory,
+            licenseState,
             metrics,
             modelCatalog,
             taskStoreService,
@@ -222,6 +228,7 @@ public Lifecycle build() {
         registerGraphDataScienceComponent();
 
         // register legacy bits
+        registerLicenseStateComponent(licenseState);
         registerMetricsComponent(metrics);
         registerModelCatalogComponent(modelCatalog);
         registerTaskRegistryFactoryComponent(taskRegistryFactoryService);
@@ -250,6 +257,16 @@ private void registerGraphDataScienceComponent() {
         );
     }
 
+    /**
+     * @deprecated Legacy stuff, will go away one day
+     */
+    @Deprecated
+    private void registerLicenseStateComponent(LicenseState licenseState) {
+        componentRegistration.registerComponent("License State", LicenseState.class, __ -> licenseState);
+
+        componentRegistration.setUpDependency(licenseState);
+    }
+
     /**
      * We register metrics as a component as a way of dependency injecting into spec framework.
      * As long as we keep that around, this hack needs to persist.