From 41b686955fd0ab22406e7eb79fa73f0b57f80bb9 Mon Sep 17 00:00:00 2001 From: vlofgren Date: Mon, 30 May 2022 12:46:30 +0200 Subject: [PATCH] API-service was accidentally moved into a subdirectory of Auth --- .../main/java/nu/marginalia/wmsa/{auth => }/api/ApiMain.java | 4 +--- .../java/nu/marginalia/wmsa/{auth => }/api/ApiService.java | 5 ++--- .../nu/marginalia/wmsa/{auth => }/api/model/ApiLicense.java | 2 +- .../wmsa/{auth => }/api/model/ApiSearchResult.java | 2 +- .../wmsa/{auth => }/api/model/ApiSearchResults.java | 2 +- .../nu/marginalia/wmsa/configuration/ServiceDescriptor.java | 2 +- .../nu/marginalia/wmsa/edge/search/EdgeSearchService.java | 4 ++-- .../marginalia/wmsa/edge/search/client/EdgeSearchClient.java | 2 +- 8 files changed, 10 insertions(+), 13 deletions(-) rename marginalia_nu/src/main/java/nu/marginalia/wmsa/{auth => }/api/ApiMain.java (92%) rename marginalia_nu/src/main/java/nu/marginalia/wmsa/{auth => }/api/ApiService.java (97%) rename marginalia_nu/src/main/java/nu/marginalia/wmsa/{auth => }/api/model/ApiLicense.java (88%) rename marginalia_nu/src/main/java/nu/marginalia/wmsa/{auth => }/api/model/ApiSearchResult.java (92%) rename marginalia_nu/src/main/java/nu/marginalia/wmsa/{auth => }/api/model/ApiSearchResults.java (86%) diff --git a/marginalia_nu/src/main/java/nu/marginalia/wmsa/auth/api/ApiMain.java b/marginalia_nu/src/main/java/nu/marginalia/wmsa/api/ApiMain.java similarity index 92% rename from marginalia_nu/src/main/java/nu/marginalia/wmsa/auth/api/ApiMain.java rename to marginalia_nu/src/main/java/nu/marginalia/wmsa/api/ApiMain.java index e5d51933..5690b807 100644 --- a/marginalia_nu/src/main/java/nu/marginalia/wmsa/auth/api/ApiMain.java +++ b/marginalia_nu/src/main/java/nu/marginalia/wmsa/api/ApiMain.java @@ -1,4 +1,4 @@ -package nu.marginalia.wmsa.auth.api; +package nu.marginalia.wmsa.api; import com.google.inject.Guice; import com.google.inject.Inject; @@ -9,8 +9,6 @@ import nu.marginalia.wmsa.configuration.module.ConfigurationModule; import nu.marginalia.wmsa.configuration.module.DatabaseModule; import nu.marginalia.wmsa.configuration.server.Initialization; -import java.io.IOException; - public class ApiMain extends MainClass { @Inject diff --git a/marginalia_nu/src/main/java/nu/marginalia/wmsa/auth/api/ApiService.java b/marginalia_nu/src/main/java/nu/marginalia/wmsa/api/ApiService.java similarity index 97% rename from marginalia_nu/src/main/java/nu/marginalia/wmsa/auth/api/ApiService.java rename to marginalia_nu/src/main/java/nu/marginalia/wmsa/api/ApiService.java index 5697cac9..c15d258b 100644 --- a/marginalia_nu/src/main/java/nu/marginalia/wmsa/auth/api/ApiService.java +++ b/marginalia_nu/src/main/java/nu/marginalia/wmsa/api/ApiService.java @@ -1,4 +1,4 @@ -package nu.marginalia.wmsa.auth.api; +package nu.marginalia.wmsa.api; import com.google.common.base.Strings; import com.google.gson.Gson; @@ -6,7 +6,7 @@ import com.google.gson.GsonBuilder; import com.google.inject.Inject; import com.google.inject.name.Named; import com.zaxxer.hikari.HikariDataSource; -import nu.marginalia.wmsa.auth.api.model.ApiLicense; +import nu.marginalia.wmsa.api.model.ApiLicense; import nu.marginalia.wmsa.configuration.server.*; import nu.marginalia.wmsa.edge.search.client.EdgeSearchClient; import org.slf4j.Logger; @@ -15,7 +15,6 @@ import spark.Request; import spark.Response; import spark.Spark; -import java.io.IOException; import java.util.concurrent.ConcurrentHashMap; public class ApiService extends Service { diff --git a/marginalia_nu/src/main/java/nu/marginalia/wmsa/auth/api/model/ApiLicense.java b/marginalia_nu/src/main/java/nu/marginalia/wmsa/api/model/ApiLicense.java similarity index 88% rename from marginalia_nu/src/main/java/nu/marginalia/wmsa/auth/api/model/ApiLicense.java rename to marginalia_nu/src/main/java/nu/marginalia/wmsa/api/model/ApiLicense.java index 21997a2b..15a6ae08 100644 --- a/marginalia_nu/src/main/java/nu/marginalia/wmsa/auth/api/model/ApiLicense.java +++ b/marginalia_nu/src/main/java/nu/marginalia/wmsa/api/model/ApiLicense.java @@ -1,4 +1,4 @@ -package nu.marginalia.wmsa.auth.api.model; +package nu.marginalia.wmsa.api.model; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; diff --git a/marginalia_nu/src/main/java/nu/marginalia/wmsa/auth/api/model/ApiSearchResult.java b/marginalia_nu/src/main/java/nu/marginalia/wmsa/api/model/ApiSearchResult.java similarity index 92% rename from marginalia_nu/src/main/java/nu/marginalia/wmsa/auth/api/model/ApiSearchResult.java rename to marginalia_nu/src/main/java/nu/marginalia/wmsa/api/model/ApiSearchResult.java index 1a6baf26..0f28d80c 100644 --- a/marginalia_nu/src/main/java/nu/marginalia/wmsa/auth/api/model/ApiSearchResult.java +++ b/marginalia_nu/src/main/java/nu/marginalia/wmsa/api/model/ApiSearchResult.java @@ -1,4 +1,4 @@ -package nu.marginalia.wmsa.auth.api.model; +package nu.marginalia.wmsa.api.model; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/marginalia_nu/src/main/java/nu/marginalia/wmsa/auth/api/model/ApiSearchResults.java b/marginalia_nu/src/main/java/nu/marginalia/wmsa/api/model/ApiSearchResults.java similarity index 86% rename from marginalia_nu/src/main/java/nu/marginalia/wmsa/auth/api/model/ApiSearchResults.java rename to marginalia_nu/src/main/java/nu/marginalia/wmsa/api/model/ApiSearchResults.java index 4551755f..db696c73 100644 --- a/marginalia_nu/src/main/java/nu/marginalia/wmsa/auth/api/model/ApiSearchResults.java +++ b/marginalia_nu/src/main/java/nu/marginalia/wmsa/api/model/ApiSearchResults.java @@ -1,4 +1,4 @@ -package nu.marginalia.wmsa.auth.api.model; +package nu.marginalia.wmsa.api.model; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/marginalia_nu/src/main/java/nu/marginalia/wmsa/configuration/ServiceDescriptor.java b/marginalia_nu/src/main/java/nu/marginalia/wmsa/configuration/ServiceDescriptor.java index eb239f8b..e0aff247 100644 --- a/marginalia_nu/src/main/java/nu/marginalia/wmsa/configuration/ServiceDescriptor.java +++ b/marginalia_nu/src/main/java/nu/marginalia/wmsa/configuration/ServiceDescriptor.java @@ -1,7 +1,7 @@ package nu.marginalia.wmsa.configuration; import nu.marginalia.wmsa.auth.AuthMain; -import nu.marginalia.wmsa.auth.api.ApiMain; +import nu.marginalia.wmsa.api.ApiMain; import nu.marginalia.wmsa.configuration.command.Command; import nu.marginalia.wmsa.configuration.command.ListCommand; import nu.marginalia.wmsa.configuration.command.StartCommand; diff --git a/marginalia_nu/src/main/java/nu/marginalia/wmsa/edge/search/EdgeSearchService.java b/marginalia_nu/src/main/java/nu/marginalia/wmsa/edge/search/EdgeSearchService.java index b052f13d..d117df15 100644 --- a/marginalia_nu/src/main/java/nu/marginalia/wmsa/edge/search/EdgeSearchService.java +++ b/marginalia_nu/src/main/java/nu/marginalia/wmsa/edge/search/EdgeSearchService.java @@ -6,8 +6,8 @@ import com.google.gson.GsonBuilder; import com.google.inject.Inject; import com.google.inject.name.Named; import lombok.SneakyThrows; -import nu.marginalia.wmsa.auth.api.model.ApiSearchResult; -import nu.marginalia.wmsa.auth.api.model.ApiSearchResults; +import nu.marginalia.wmsa.api.model.ApiSearchResult; +import nu.marginalia.wmsa.api.model.ApiSearchResults; import nu.marginalia.wmsa.client.exception.TimeoutException; import nu.marginalia.wmsa.configuration.server.Context; import nu.marginalia.wmsa.configuration.server.Initialization; diff --git a/marginalia_nu/src/main/java/nu/marginalia/wmsa/edge/search/client/EdgeSearchClient.java b/marginalia_nu/src/main/java/nu/marginalia/wmsa/edge/search/client/EdgeSearchClient.java index 53a29067..3e38c3f6 100644 --- a/marginalia_nu/src/main/java/nu/marginalia/wmsa/edge/search/client/EdgeSearchClient.java +++ b/marginalia_nu/src/main/java/nu/marginalia/wmsa/edge/search/client/EdgeSearchClient.java @@ -2,7 +2,7 @@ package nu.marginalia.wmsa.edge.search.client; import com.google.inject.Singleton; import io.reactivex.rxjava3.core.Observable; -import nu.marginalia.wmsa.auth.api.model.ApiSearchResults; +import nu.marginalia.wmsa.api.model.ApiSearchResults; import nu.marginalia.wmsa.client.AbstractDynamicClient; import nu.marginalia.wmsa.configuration.ServiceDescriptor; import nu.marginalia.wmsa.configuration.server.Context;