From f4ff7185f0631b24fd64f3a1d71c2cb77b52003b Mon Sep 17 00:00:00 2001 From: Viktor Lofgren Date: Fri, 23 Feb 2024 11:18:29 +0100 Subject: [PATCH] (refac) Move process-mqapi out of api directory --- code/{api => }/process-mqapi/build.gradle | 0 .../src/main/java/nu/marginalia/mqapi/ProcessInboxNames.java | 0 .../main/java/nu/marginalia/mqapi/converting/ConvertAction.java | 0 .../java/nu/marginalia/mqapi/converting/ConvertRequest.java | 0 .../main/java/nu/marginalia/mqapi/crawling/CrawlRequest.java | 0 .../main/java/nu/marginalia/mqapi/index/CreateIndexRequest.java | 0 .../src/main/java/nu/marginalia/mqapi/index/IndexName.java | 0 .../src/main/java/nu/marginalia/mqapi/loading/LoadRequest.java | 0 code/processes/converting-process/build.gradle | 2 +- code/processes/crawling-process/build.gradle | 2 +- code/processes/index-constructor-process/build.gradle | 2 +- code/processes/loading-process/build.gradle | 2 +- code/services-core/control-service/build.gradle | 2 +- code/services-core/executor-service/build.gradle | 2 +- settings.gradle | 2 +- 15 files changed, 7 insertions(+), 7 deletions(-) rename code/{api => }/process-mqapi/build.gradle (100%) rename code/{api => }/process-mqapi/src/main/java/nu/marginalia/mqapi/ProcessInboxNames.java (100%) rename code/{api => }/process-mqapi/src/main/java/nu/marginalia/mqapi/converting/ConvertAction.java (100%) rename code/{api => }/process-mqapi/src/main/java/nu/marginalia/mqapi/converting/ConvertRequest.java (100%) rename code/{api => }/process-mqapi/src/main/java/nu/marginalia/mqapi/crawling/CrawlRequest.java (100%) rename code/{api => }/process-mqapi/src/main/java/nu/marginalia/mqapi/index/CreateIndexRequest.java (100%) rename code/{api => }/process-mqapi/src/main/java/nu/marginalia/mqapi/index/IndexName.java (100%) rename code/{api => }/process-mqapi/src/main/java/nu/marginalia/mqapi/loading/LoadRequest.java (100%) diff --git a/code/api/process-mqapi/build.gradle b/code/process-mqapi/build.gradle similarity index 100% rename from code/api/process-mqapi/build.gradle rename to code/process-mqapi/build.gradle diff --git a/code/api/process-mqapi/src/main/java/nu/marginalia/mqapi/ProcessInboxNames.java b/code/process-mqapi/src/main/java/nu/marginalia/mqapi/ProcessInboxNames.java similarity index 100% rename from code/api/process-mqapi/src/main/java/nu/marginalia/mqapi/ProcessInboxNames.java rename to code/process-mqapi/src/main/java/nu/marginalia/mqapi/ProcessInboxNames.java diff --git a/code/api/process-mqapi/src/main/java/nu/marginalia/mqapi/converting/ConvertAction.java b/code/process-mqapi/src/main/java/nu/marginalia/mqapi/converting/ConvertAction.java similarity index 100% rename from code/api/process-mqapi/src/main/java/nu/marginalia/mqapi/converting/ConvertAction.java rename to code/process-mqapi/src/main/java/nu/marginalia/mqapi/converting/ConvertAction.java diff --git a/code/api/process-mqapi/src/main/java/nu/marginalia/mqapi/converting/ConvertRequest.java b/code/process-mqapi/src/main/java/nu/marginalia/mqapi/converting/ConvertRequest.java similarity index 100% rename from code/api/process-mqapi/src/main/java/nu/marginalia/mqapi/converting/ConvertRequest.java rename to code/process-mqapi/src/main/java/nu/marginalia/mqapi/converting/ConvertRequest.java diff --git a/code/api/process-mqapi/src/main/java/nu/marginalia/mqapi/crawling/CrawlRequest.java b/code/process-mqapi/src/main/java/nu/marginalia/mqapi/crawling/CrawlRequest.java similarity index 100% rename from code/api/process-mqapi/src/main/java/nu/marginalia/mqapi/crawling/CrawlRequest.java rename to code/process-mqapi/src/main/java/nu/marginalia/mqapi/crawling/CrawlRequest.java diff --git a/code/api/process-mqapi/src/main/java/nu/marginalia/mqapi/index/CreateIndexRequest.java b/code/process-mqapi/src/main/java/nu/marginalia/mqapi/index/CreateIndexRequest.java similarity index 100% rename from code/api/process-mqapi/src/main/java/nu/marginalia/mqapi/index/CreateIndexRequest.java rename to code/process-mqapi/src/main/java/nu/marginalia/mqapi/index/CreateIndexRequest.java diff --git a/code/api/process-mqapi/src/main/java/nu/marginalia/mqapi/index/IndexName.java b/code/process-mqapi/src/main/java/nu/marginalia/mqapi/index/IndexName.java similarity index 100% rename from code/api/process-mqapi/src/main/java/nu/marginalia/mqapi/index/IndexName.java rename to code/process-mqapi/src/main/java/nu/marginalia/mqapi/index/IndexName.java diff --git a/code/api/process-mqapi/src/main/java/nu/marginalia/mqapi/loading/LoadRequest.java b/code/process-mqapi/src/main/java/nu/marginalia/mqapi/loading/LoadRequest.java similarity index 100% rename from code/api/process-mqapi/src/main/java/nu/marginalia/mqapi/loading/LoadRequest.java rename to code/process-mqapi/src/main/java/nu/marginalia/mqapi/loading/LoadRequest.java diff --git a/code/processes/converting-process/build.gradle b/code/processes/converting-process/build.gradle index caa7e4a8..f36b30d0 100644 --- a/code/processes/converting-process/build.gradle +++ b/code/processes/converting-process/build.gradle @@ -25,7 +25,7 @@ dependencies { implementation project(':third-party:count-min-sketch') implementation project(':code:index:api') - implementation project(':code:api:process-mqapi') + implementation project(':code:process-mqapi') implementation project(':code:common:model') implementation project(':code:common:db') diff --git a/code/processes/crawling-process/build.gradle b/code/processes/crawling-process/build.gradle index 6a1a3823..ed53c6a0 100644 --- a/code/processes/crawling-process/build.gradle +++ b/code/processes/crawling-process/build.gradle @@ -28,7 +28,7 @@ dependencies { implementation project(':code:libraries:big-string') implementation project(':code:libraries:blocking-thread-pool') implementation project(':code:index:api') - implementation project(':code:api:process-mqapi') + implementation project(':code:process-mqapi') implementation project(':code:common:service-discovery') implementation project(':code:libraries:message-queue') implementation project(':code:libraries:language-processing') diff --git a/code/processes/index-constructor-process/build.gradle b/code/processes/index-constructor-process/build.gradle index 6b6ae660..f7361358 100644 --- a/code/processes/index-constructor-process/build.gradle +++ b/code/processes/index-constructor-process/build.gradle @@ -19,7 +19,7 @@ application { tasks.distZip.enabled = false dependencies { - implementation project(':code:api:process-mqapi') + implementation project(':code:process-mqapi') implementation project(':code:common:process') implementation project(':code:common:service') implementation project(':code:common:db') diff --git a/code/processes/loading-process/build.gradle b/code/processes/loading-process/build.gradle index db139f36..66db9cb9 100644 --- a/code/processes/loading-process/build.gradle +++ b/code/processes/loading-process/build.gradle @@ -19,7 +19,7 @@ tasks.distZip.enabled = false dependencies { implementation project(':code:common:process') - implementation project(':code:api:process-mqapi') + implementation project(':code:process-mqapi') implementation project(':code:index:api') implementation project(':code:common:model') implementation project(':code:common:db') diff --git a/code/services-core/control-service/build.gradle b/code/services-core/control-service/build.gradle index 99390c27..b5e69e98 100644 --- a/code/services-core/control-service/build.gradle +++ b/code/services-core/control-service/build.gradle @@ -48,7 +48,7 @@ dependencies { implementation project(':code:functions:search-query:api') implementation project(':code:api:executor-api') implementation project(':code:index:api') - implementation project(':code:api:process-mqapi') + implementation project(':code:process-mqapi') implementation project(':code:features-search:screenshots') implementation project(':code:index:index-journal') implementation project(':code:index:query') diff --git a/code/services-core/executor-service/build.gradle b/code/services-core/executor-service/build.gradle index 5139c4eb..f079a675 100644 --- a/code/services-core/executor-service/build.gradle +++ b/code/services-core/executor-service/build.gradle @@ -71,7 +71,7 @@ dependencies { implementation project(':code:features-convert:reddit-json') implementation project(':code:index:index-journal') implementation project(':code:index:api') - implementation project(':code:api:process-mqapi') + implementation project(':code:process-mqapi') implementation project(':code:api:executor-api') implementation project(':third-party:encyclopedia-marginalia-nu') diff --git a/settings.gradle b/settings.gradle index b6f2f9c0..15561f1a 100644 --- a/settings.gradle +++ b/settings.gradle @@ -65,7 +65,7 @@ include 'code:features-crawl:crawl-blocklist' include 'code:features-crawl:link-parser' include 'code:features-crawl:content-type' -include 'code:api:process-mqapi' +include 'code:process-mqapi' include 'code:api:executor-api' include 'code:common:service-discovery'