161sh/CatgirlIntelligenceAgency
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

API-service was accidentally moved into a subdirectory of Auth

Browse Source
This commit is contained in:
vlofgren 2022-05-30 12:46:30 +02:00
parent 75c4986532
commit 41b686955f
8 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
marginalia_nu/src/main/java/nu/marginalia/wmsa/auth/api/ApiMain.java → marginalia_nu/src/main/java/nu/marginalia/wmsa/api/ApiMain.java
View File

@ -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

5
marginalia_nu/src/main/java/nu/marginalia/wmsa/auth/api/ApiService.java → marginalia_nu/src/main/java/nu/marginalia/wmsa/api/ApiService.java
View File

@ -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 {

2
marginalia_nu/src/main/java/nu/marginalia/wmsa/auth/api/model/ApiLicense.java → marginalia_nu/src/main/java/nu/marginalia/wmsa/api/model/ApiLicense.java
View File

@ -1,4 +1,4 @@
package nu.marginalia.wmsa.auth.api.model;
package nu.marginalia.wmsa.api.model;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;

2
marginalia_nu/src/main/java/nu/marginalia/wmsa/auth/api/model/ApiSearchResult.java → marginalia_nu/src/main/java/nu/marginalia/wmsa/api/model/ApiSearchResult.java
View File

@ -1,4 +1,4 @@
package nu.marginalia.wmsa.auth.api.model;
package nu.marginalia.wmsa.api.model;
import lombok.AllArgsConstructor;
import lombok.Getter;

2
marginalia_nu/src/main/java/nu/marginalia/wmsa/auth/api/model/ApiSearchResults.java → marginalia_nu/src/main/java/nu/marginalia/wmsa/api/model/ApiSearchResults.java
View File

@ -1,4 +1,4 @@
package nu.marginalia.wmsa.auth.api.model;
package nu.marginalia.wmsa.api.model;
import lombok.AllArgsConstructor;
import lombok.Getter;

2
marginalia_nu/src/main/java/nu/marginalia/wmsa/configuration/ServiceDescriptor.java
View File

@ -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;

4
marginalia_nu/src/main/java/nu/marginalia/wmsa/edge/search/EdgeSearchService.java
View File

@ -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;

2
marginalia_nu/src/main/java/nu/marginalia/wmsa/edge/search/client/EdgeSearchClient.java
View File

@ -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;