(executor-service) Retire features-convert and move the corresponding packages into the executor service.

code/features-control/actors/build.gradle

@@ -1,41 +0,0 @@
-
-plugins {
-    id 'java'
-    id 'jvm-test-suite'
-}
-
-java {
-    toolchain {
-        languageVersion.set(JavaLanguageVersion.of(21))
-    }
-}
-
-dependencies {
-
-    implementation project(':code:libraries:message-queue')
-    implementation project(':code:common:service')
-    implementation project(':code:common:process')
-    implementation project(':code:common:model')
-    implementation project(':code:common:service-client')
-    implementation project(':code:common:db')
-    implementation project(':code:common:config')
-    implementation project(':code:api:process-mqapi')
-    implementation project(':code:api:index-api')
-    implementation project(':code:features-control:process-execution')
-    implementation project(':code:features-index:index-journal')
-    implementation project(':code:process-models:crawl-spec')
-
-    implementation libs.bundles.slf4j
-    implementation libs.guice
-    implementation libs.notnull
-    implementation libs.spark
-    implementation libs.jsoup
-    implementation libs.zstd
-    implementation libs.bundles.mariadb
-    implementation libs.commons.io
-    implementation libs.bundles.gson
-
-    testImplementation libs.bundles.slf4j.test
-    testImplementation libs.bundles.junit
-    testImplementation libs.mockito
-}

code/features-control/process-execution/build.gradle

@@ -1,28 +0,0 @@
-
-plugins {
-    id 'java'
-    id 'jvm-test-suite'
-}
-
-java {
-    toolchain {
-        languageVersion.set(JavaLanguageVersion.of(21))
-    }
-}
-
-dependencies {
-
-    implementation project(':code:libraries:message-queue')
-    implementation project(':code:common:service')
-    implementation project(':code:common:process')
-    implementation project(':code:api:process-mqapi')
-
-    implementation libs.bundles.slf4j
-    implementation libs.guice
-    implementation libs.notnull
-    implementation libs.jsoup
-
-    testImplementation libs.bundles.slf4j.test
-    testImplementation libs.bundles.junit
-    testImplementation libs.mockito
-}

code/services-core/executor-service/build.gradle

@@ -25,16 +25,20 @@ dependencies {
     implementation project(':code:common:config')
     implementation project(':code:common:model')
     implementation project(':code:common:db')
+
     implementation project(':code:common:service')
     implementation project(':code:common:service-client')
-    implementation project(':code:api:index-api')
-    implementation project(':code:api:query-api')
-    implementation project(':code:api:executor-api')
     implementation project(':code:common:service-discovery')
+
     implementation project(':code:libraries:message-queue')
 
-    implementation project(':code:features-control:process-execution')
+    implementation project(':code:process-models:crawl-spec')
-    implementation project(':code:features-control:actors')
+    implementation project(':code:features-index:index-journal')
+
+    implementation project(':code:api:index-api')
+    implementation project(':code:api:query-api')
+    implementation project(':code:api:process-mqapi')
+    implementation project(':code:api:executor-api')
 
     implementation libs.bundles.slf4j
 
@@ -45,6 +49,8 @@ dependencies {
     implementation libs.guice
     implementation libs.protobuf
     implementation libs.rxjava
+    implementation libs.zstd
+    implementation libs.commons.io
     implementation libs.bundles.mariadb
 
     testImplementation libs.bundles.slf4j.test

code/services-core/executor-service/src/main/java/nu/marginalia/actor/monitor/AbstractProcessSpawnerActor.java

@@ -7,7 +7,7 @@ import nu.marginalia.actor.prototype.AbstractActorPrototype;
 import nu.marginalia.actor.state.ActorResumeBehavior;
 import nu.marginalia.actor.state.ActorState;
 import nu.marginalia.actor.state.ActorTerminalState;
-import nu.marginalia.control.process.ProcessService;
+import nu.marginalia.process.ProcessService;
 import nu.marginalia.mq.MqMessageState;
 import nu.marginalia.mq.persistence.MqPersistence;
 import nu.marginalia.service.module.ServiceConfiguration;

code/services-core/executor-service/src/main/java/nu/marginalia/actor/proc/ConverterMonitorActor.java

@@ -4,7 +4,7 @@ import com.google.inject.Inject;
 import com.google.inject.Singleton;
 import nu.marginalia.actor.ActorStateFactory;
 import nu.marginalia.actor.monitor.AbstractProcessSpawnerActor;
-import nu.marginalia.control.process.ProcessService;
+import nu.marginalia.process.ProcessService;
 import nu.marginalia.mq.persistence.MqPersistence;
 import nu.marginalia.mqapi.ProcessInboxNames;
 import nu.marginalia.service.module.ServiceConfiguration;

code/services-core/executor-service/src/main/java/nu/marginalia/actor/proc/CrawlerMonitorActor.java

@@ -4,7 +4,7 @@ import com.google.inject.Inject;
 import com.google.inject.Singleton;
 import nu.marginalia.actor.ActorStateFactory;
 import nu.marginalia.actor.monitor.AbstractProcessSpawnerActor;
-import nu.marginalia.control.process.ProcessService;
+import nu.marginalia.process.ProcessService;
 import nu.marginalia.mq.persistence.MqPersistence;
 import nu.marginalia.mqapi.ProcessInboxNames;
 import nu.marginalia.service.module.ServiceConfiguration;

code/services-core/executor-service/src/main/java/nu/marginalia/actor/proc/IndexConstructorMonitorActor.java

@@ -4,7 +4,7 @@ import com.google.inject.Inject;
 import com.google.inject.Singleton;
 import nu.marginalia.actor.ActorStateFactory;
 import nu.marginalia.actor.monitor.AbstractProcessSpawnerActor;
-import nu.marginalia.control.process.ProcessService;
+import nu.marginalia.process.ProcessService;
 import nu.marginalia.mq.persistence.MqPersistence;
 import nu.marginalia.mqapi.ProcessInboxNames;
 import nu.marginalia.service.module.ServiceConfiguration;

code/services-core/executor-service/src/main/java/nu/marginalia/actor/proc/LoaderMonitorActor.java

@@ -4,7 +4,7 @@ import com.google.inject.Inject;
 import com.google.inject.Singleton;
 import nu.marginalia.actor.ActorStateFactory;
 import nu.marginalia.actor.monitor.AbstractProcessSpawnerActor;
-import nu.marginalia.control.process.ProcessService;
+import nu.marginalia.process.ProcessService;
 import nu.marginalia.mq.persistence.MqPersistence;
 import nu.marginalia.mqapi.ProcessInboxNames;
 import nu.marginalia.service.module.ServiceConfiguration;

code/services-core/executor-service/src/main/java/nu/marginalia/actor/proc/ProcessLivenessMonitorActor.java

@@ -7,7 +7,7 @@ import nu.marginalia.actor.ActorStateFactory;
 import nu.marginalia.actor.prototype.AbstractActorPrototype;
 import nu.marginalia.actor.state.ActorResumeBehavior;
 import nu.marginalia.actor.state.ActorState;
-import nu.marginalia.control.process.ProcessService;
+import nu.marginalia.process.ProcessService;
 import nu.marginalia.service.control.ServiceEventLog;
 
 import java.sql.SQLException;

code/services-core/executor-service/src/main/java/nu/marginalia/actor/task/ActorProcessWatcher.java

@@ -3,7 +3,7 @@ package nu.marginalia.actor.task;
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
 import nu.marginalia.actor.prototype.AbstractActorPrototype;
-import nu.marginalia.control.process.ProcessService;
+import nu.marginalia.process.ProcessService;
 import nu.marginalia.mq.MqMessage;
 import nu.marginalia.mq.outbox.MqOutbox;
 

code/services-core/executor-service/src/main/java/nu/marginalia/actor/task/ConvertActor.java

@@ -10,8 +10,8 @@ import nu.marginalia.actor.ActorStateFactory;
 import nu.marginalia.actor.prototype.AbstractActorPrototype;
 import nu.marginalia.actor.state.ActorResumeBehavior;
 import nu.marginalia.actor.state.ActorState;
-import nu.marginalia.control.process.ProcessOutboxes;
+import nu.marginalia.process.ProcessOutboxes;
-import nu.marginalia.control.process.ProcessService;
+import nu.marginalia.process.ProcessService;
 import nu.marginalia.storage.FileStorageService;
 import nu.marginalia.storage.model.FileStorageBaseType;
 import nu.marginalia.storage.model.FileStorageId;

code/services-core/executor-service/src/main/java/nu/marginalia/actor/task/ConvertAndLoadActor.java

@@ -10,8 +10,8 @@ import nu.marginalia.actor.ActorStateFactory;
 import nu.marginalia.actor.prototype.AbstractActorPrototype;
 import nu.marginalia.actor.state.ActorResumeBehavior;
 import nu.marginalia.actor.state.ActorState;
-import nu.marginalia.control.process.ProcessOutboxes;
+import nu.marginalia.process.ProcessOutboxes;
-import nu.marginalia.control.process.ProcessService;
+import nu.marginalia.process.ProcessService;
 import nu.marginalia.svc.BackupService;
 import nu.marginalia.storage.FileStorageService;
 import nu.marginalia.storage.model.FileStorageBaseType;

code/services-core/executor-service/src/main/java/nu/marginalia/actor/task/CrawlActor.java

@@ -10,8 +10,8 @@ import nu.marginalia.actor.ActorStateFactory;
 import nu.marginalia.actor.prototype.AbstractActorPrototype;
 import nu.marginalia.actor.state.ActorResumeBehavior;
 import nu.marginalia.actor.state.ActorState;
-import nu.marginalia.control.process.ProcessOutboxes;
+import nu.marginalia.process.ProcessOutboxes;
-import nu.marginalia.control.process.ProcessService;
+import nu.marginalia.process.ProcessService;
 import nu.marginalia.storage.FileStorageService;
 import nu.marginalia.storage.model.FileStorageBaseType;
 import nu.marginalia.storage.model.FileStorageId;

code/services-core/executor-service/src/main/java/nu/marginalia/actor/task/RecrawlActor.java

@@ -10,8 +10,8 @@ import nu.marginalia.actor.ActorStateFactory;
 import nu.marginalia.actor.prototype.AbstractActorPrototype;
 import nu.marginalia.actor.state.ActorResumeBehavior;
 import nu.marginalia.actor.state.ActorState;
-import nu.marginalia.control.process.ProcessOutboxes;
+import nu.marginalia.process.ProcessOutboxes;
-import nu.marginalia.control.process.ProcessService;
+import nu.marginalia.process.ProcessService;
 import nu.marginalia.storage.FileStorageService;
 import nu.marginalia.storage.model.FileStorage;
 import nu.marginalia.storage.model.FileStorageId;

code/services-core/executor-service/src/main/java/nu/marginalia/actor/task/TriggerAdjacencyCalculationActor.java

@@ -6,7 +6,7 @@ import nu.marginalia.actor.ActorStateFactory;
 import nu.marginalia.actor.prototype.AbstractActorPrototype;
 import nu.marginalia.actor.state.ActorResumeBehavior;
 import nu.marginalia.actor.state.ActorState;
-import nu.marginalia.control.process.ProcessService;
+import nu.marginalia.process.ProcessService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

code/services-core/executor-service/src/main/java/nu/marginalia/process/ProcessOutboxes.java

@@ -1,4 +1,4 @@
-package nu.marginalia.control.process;
+package nu.marginalia.process;
 
 import com.google.inject.Inject;
 import com.google.inject.Singleton;

code/services-core/executor-service/src/main/java/nu/marginalia/process/ProcessService.java

@@ -1,4 +1,4 @@
-package nu.marginalia.control.process;
+package nu.marginalia.process;
 
 import com.google.inject.Inject;
 import com.google.inject.Singleton;

code/services-core/executor-service/src/test/java/nu/marginalia/executor/ExecutorSvcApiIntegrationTest.java

@@ -9,8 +9,8 @@ import nu.marginalia.actor.ActorControlService;
 import nu.marginalia.actor.task.CrawlJobExtractorActor;
 import nu.marginalia.client.Context;
 import nu.marginalia.client.route.RouteProvider;
-import nu.marginalia.control.process.ProcessOutboxes;
+import nu.marginalia.process.ProcessOutboxes;
-import nu.marginalia.control.process.ProcessService;
+import nu.marginalia.process.ProcessService;
 import nu.marginalia.storage.FileStorageService;
 import nu.marginalia.storage.model.FileStorageId;
 import nu.marginalia.executor.client.ExecutorClient;

settings.gradle

@@ -30,9 +30,6 @@ include 'code:features-search:random-websites'
 include 'code:features-qs:query-parser'
 include 'code:features-index:result-ranking'
 
-include 'code:features-control:process-execution'
-include 'code:features-control:actors'
-
 include 'code:features-convert:adblock'
 include 'code:features-convert:stackexchange-xml'
 include 'code:features-convert:pubdate'