The-pack-family
/
APIv3
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move packes to more Spring-like structure

This commit is contained in:
Colin McDonald 2016-12-17 14:21:40 -05:00
parent 23bcc1d985
commit 78067c2c51
150 changed files with 592 additions and 575 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

230
src/main/java/net/frozenorb/apiv3/APIv3.java
View File

@ -2,168 +2,132 @@ package net.frozenorb.apiv3;
import com.google.common.net.MediaType;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import net.frozenorb.apiv3.filter.AuthenticationFilter;
import net.frozenorb.apiv3.filter.AuthorizationFilter;
import net.frozenorb.apiv3.filter.MetricsFilter;
import net.frozenorb.apiv3.filter.WebsiteUserSessionFilter;
import net.frozenorb.apiv3.model.BannedAsn;
import net.frozenorb.apiv3.model.BannedCellCarrier;
import net.frozenorb.apiv3.model.Rank;
import net.frozenorb.apiv3.model.Server;
import net.frozenorb.apiv3.model.ServerGroup;
import net.frozenorb.apiv3.route.GETDumpsType;
import net.frozenorb.apiv3.route.GETSearch;
import net.frozenorb.apiv3.route.GETWhoAmI;
import net.frozenorb.apiv3.route.POSTLogout;
import net.frozenorb.apiv3.route.accessTokens.DELETEAccessTokensId;
import net.frozenorb.apiv3.route.accessTokens.GETAccessTokens;
import net.frozenorb.apiv3.route.accessTokens.GETAccessTokensId;
import net.frozenorb.apiv3.route.accessTokens.POSTAccessTokens;
import net.frozenorb.apiv3.route.auditLog.DELETEAuditLogId;
import net.frozenorb.apiv3.route.auditLog.GETAuditLog;
import net.frozenorb.apiv3.route.auditLog.POSTAuditLog;
import net.frozenorb.apiv3.route.bannedAsns.DELETEBannedAsnsId;
import net.frozenorb.apiv3.route.bannedAsns.GETBannedAsns;
import net.frozenorb.apiv3.route.bannedAsns.GETBannedAsnsId;
import net.frozenorb.apiv3.route.bannedAsns.POSTBannedAsns;
import net.frozenorb.apiv3.route.bannedCellCarriers.DELETEBannedCellCarriersId;
import net.frozenorb.apiv3.route.bannedCellCarriers.GETBannedCellCarriers;
import net.frozenorb.apiv3.route.bannedCellCarriers.GETBannedCellCarriersId;
import net.frozenorb.apiv3.route.bannedCellCarriers.POSTBannedCellCarriers;
import net.frozenorb.apiv3.route.chatFilter.DELETEChatFilterId;
import net.frozenorb.apiv3.route.chatFilter.GETChatFilter;
import net.frozenorb.apiv3.route.chatFilter.GETChatFilterId;
import net.frozenorb.apiv3.route.chatFilter.POSTChatFilter;
import net.frozenorb.apiv3.route.deployment.POSTDeploymentUpdateServer;
import net.frozenorb.apiv3.route.disposableLoginTokens.POSTDisposableLoginTokens;
import net.frozenorb.apiv3.route.disposableLoginTokens.POSTDisposableLoginTokensIdUse;
import net.frozenorb.apiv3.route.emailTokens.GETEmailTokensIdOwner;
import net.frozenorb.apiv3.route.emailTokens.POSTEmailTokensIdConfirm;
import net.frozenorb.apiv3.route.grants.DELETEGrantsId;
import net.frozenorb.apiv3.route.grants.GETGrants;
import net.frozenorb.apiv3.route.grants.GETGrantsId;
import net.frozenorb.apiv3.route.grants.POSTGrants;
import net.frozenorb.apiv3.route.ipBans.DELETEIpBansId;
import net.frozenorb.apiv3.route.ipBans.GETIpBans;
import net.frozenorb.apiv3.route.ipBans.GETIpBansId;
import net.frozenorb.apiv3.route.ipBans.POSTIpBans;
import net.frozenorb.apiv3.route.ipIntel.GETIpInteld;
import net.frozenorb.apiv3.route.ipLog.GETIpLogId;
import net.frozenorb.apiv3.route.lookup.POSTLookupByName;
import net.frozenorb.apiv3.route.lookup.POSTLookupByUuid;
import net.frozenorb.apiv3.route.notificationTemplates.DELETENotificationTemplatesId;
import net.frozenorb.apiv3.route.notificationTemplates.GETNotificationTemplates;
import net.frozenorb.apiv3.route.notificationTemplates.GETNotificationTemplatesId;
import net.frozenorb.apiv3.route.notificationTemplates.POSTNotificationTemplates;
import net.frozenorb.apiv3.route.phoneIntel.GETPhoneInteld;
import net.frozenorb.apiv3.route.punishments.DELETEPunishmentsId;
import net.frozenorb.apiv3.route.punishments.DELETEUsersIdActivePunishment;
import net.frozenorb.apiv3.route.punishments.GETPunishments;
import net.frozenorb.apiv3.route.punishments.GETPunishmentsId;
import net.frozenorb.apiv3.route.punishments.POSTPunishments;
import net.frozenorb.apiv3.route.ranks.DELETERanksId;
import net.frozenorb.apiv3.route.ranks.GETRanks;
import net.frozenorb.apiv3.route.ranks.GETRanksId;
import net.frozenorb.apiv3.route.ranks.POSTRanks;
import net.frozenorb.apiv3.route.serverGroups.DELETEServerGroupsId;
import net.frozenorb.apiv3.route.serverGroups.GETServerGroups;
import net.frozenorb.apiv3.route.serverGroups.GETServerGroupsId;
import net.frozenorb.apiv3.route.serverGroups.POSTServerGroups;
import net.frozenorb.apiv3.route.servers.DELETEServersId;
import net.frozenorb.apiv3.route.servers.GETServers;
import net.frozenorb.apiv3.route.servers.GETServersId;
import net.frozenorb.apiv3.route.servers.POSTServers;
import net.frozenorb.apiv3.route.servers.POSTServersHeartbeat;
import net.frozenorb.apiv3.route.users.GETStaff;
import net.frozenorb.apiv3.route.users.GETUsersId;
import net.frozenorb.apiv3.route.users.GETUsersIdCompoundedPermissions;
import net.frozenorb.apiv3.route.users.GETUsersIdDetails;
import net.frozenorb.apiv3.route.users.GETUsersIdRequiresTotp;
import net.frozenorb.apiv3.route.users.GETUsersIdVerifyPassword;
import net.frozenorb.apiv3.route.users.POSTUsersIdChangePassword;
import net.frozenorb.apiv3.route.users.POSTUsersIdConfirmPhone;
import net.frozenorb.apiv3.route.users.POSTUsersIdLogin;
import net.frozenorb.apiv3.route.users.POSTUsersIdNotify;
import net.frozenorb.apiv3.route.users.POSTUsersIdPasswordReset;
import net.frozenorb.apiv3.route.users.POSTUsersIdRegisterEmail;
import net.frozenorb.apiv3.route.users.POSTUsersIdRegisterPhone;
import net.frozenorb.apiv3.route.users.POSTUsersIdSetupTotp;
import net.frozenorb.apiv3.route.users.POSTUsersIdVerifyTotp;
import net.frozenorb.apiv3.route.users.POSTUsersUsePasswordResetToken;
import net.frozenorb.apiv3.serialization.gson.FollowAnnotationExclusionStrategy;
import net.frozenorb.apiv3.serialization.gson.InstantTypeAdapter;
import net.frozenorb.apiv3.web.filter.AuthenticationFilter;
import net.frozenorb.apiv3.web.filter.AuthorizationFilter;
import net.frozenorb.apiv3.web.filter.MetricsFilter;
import net.frozenorb.apiv3.web.filter.WebsiteUserSessionFilter;
import net.frozenorb.apiv3.domain.BannedAsn;
import net.frozenorb.apiv3.domain.BannedCellCarrier;
import net.frozenorb.apiv3.domain.Rank;
import net.frozenorb.apiv3.domain.Server;
import net.frozenorb.apiv3.domain.ServerGroup;
import net.frozenorb.apiv3.web.route.GETDumpsType;
import net.frozenorb.apiv3.web.route.GETSearch;
import net.frozenorb.apiv3.web.route.GETWhoAmI;
import net.frozenorb.apiv3.web.route.POSTLogout;
import net.frozenorb.apiv3.web.route.accessTokens.DELETEAccessTokensId;
import net.frozenorb.apiv3.web.route.accessTokens.GETAccessTokens;
import net.frozenorb.apiv3.web.route.accessTokens.GETAccessTokensId;
import net.frozenorb.apiv3.web.route.accessTokens.POSTAccessTokens;
import net.frozenorb.apiv3.web.route.auditLog.DELETEAuditLogId;
import net.frozenorb.apiv3.web.route.auditLog.GETAuditLog;
import net.frozenorb.apiv3.web.route.auditLog.POSTAuditLog;
import net.frozenorb.apiv3.web.route.bannedAsns.DELETEBannedAsnsId;
import net.frozenorb.apiv3.web.route.bannedAsns.GETBannedAsns;
import net.frozenorb.apiv3.web.route.bannedAsns.GETBannedAsnsId;
import net.frozenorb.apiv3.web.route.bannedAsns.POSTBannedAsns;
import net.frozenorb.apiv3.web.route.bannedCellCarriers.DELETEBannedCellCarriersId;
import net.frozenorb.apiv3.web.route.bannedCellCarriers.GETBannedCellCarriers;
import net.frozenorb.apiv3.web.route.bannedCellCarriers.GETBannedCellCarriersId;
import net.frozenorb.apiv3.web.route.bannedCellCarriers.POSTBannedCellCarriers;
import net.frozenorb.apiv3.web.route.chatFilter.DELETEChatFilterId;
import net.frozenorb.apiv3.web.route.chatFilter.GETChatFilter;
import net.frozenorb.apiv3.web.route.chatFilter.GETChatFilterId;
import net.frozenorb.apiv3.web.route.chatFilter.POSTChatFilter;
import net.frozenorb.apiv3.web.route.deployment.POSTDeploymentUpdateServer;
import net.frozenorb.apiv3.web.route.disposableLoginTokens.POSTDisposableLoginTokens;
import net.frozenorb.apiv3.web.route.disposableLoginTokens.POSTDisposableLoginTokensIdUse;
import net.frozenorb.apiv3.web.route.emailTokens.GETEmailTokensIdOwner;
import net.frozenorb.apiv3.web.route.emailTokens.POSTEmailTokensIdConfirm;
import net.frozenorb.apiv3.web.route.grants.DELETEGrantsId;
import net.frozenorb.apiv3.web.route.grants.GETGrants;
import net.frozenorb.apiv3.web.route.grants.GETGrantsId;
import net.frozenorb.apiv3.web.route.grants.POSTGrants;
import net.frozenorb.apiv3.web.route.ipBans.DELETEIpBansId;
import net.frozenorb.apiv3.web.route.ipBans.GETIpBans;
import net.frozenorb.apiv3.web.route.ipBans.GETIpBansId;
import net.frozenorb.apiv3.web.route.ipBans.POSTIpBans;
import net.frozenorb.apiv3.web.route.ipIntel.GETIpInteld;
import net.frozenorb.apiv3.web.route.ipLog.GETIpLogId;
import net.frozenorb.apiv3.web.route.lookup.POSTLookupByName;
import net.frozenorb.apiv3.web.route.lookup.POSTLookupByUuid;
import net.frozenorb.apiv3.web.route.notificationTemplates.DELETENotificationTemplatesId;
import net.frozenorb.apiv3.web.route.notificationTemplates.GETNotificationTemplates;
import net.frozenorb.apiv3.web.route.notificationTemplates.GETNotificationTemplatesId;
import net.frozenorb.apiv3.web.route.notificationTemplates.POSTNotificationTemplates;
import net.frozenorb.apiv3.web.route.phoneIntel.GETPhoneInteld;
import net.frozenorb.apiv3.web.route.punishments.DELETEPunishmentsId;
import net.frozenorb.apiv3.web.route.punishments.DELETEUsersIdActivePunishment;
import net.frozenorb.apiv3.web.route.punishments.GETPunishments;
import net.frozenorb.apiv3.web.route.punishments.GETPunishmentsId;
import net.frozenorb.apiv3.web.route.punishments.POSTPunishments;
import net.frozenorb.apiv3.web.route.ranks.DELETERanksId;
import net.frozenorb.apiv3.web.route.ranks.GETRanks;
import net.frozenorb.apiv3.web.route.ranks.GETRanksId;
import net.frozenorb.apiv3.web.route.ranks.POSTRanks;
import net.frozenorb.apiv3.web.route.serverGroups.DELETEServerGroupsId;
import net.frozenorb.apiv3.web.route.serverGroups.GETServerGroups;
import net.frozenorb.apiv3.web.route.serverGroups.GETServerGroupsId;
import net.frozenorb.apiv3.web.route.serverGroups.POSTServerGroups;
import net.frozenorb.apiv3.web.route.servers.DELETEServersId;
import net.frozenorb.apiv3.web.route.servers.GETServers;
import net.frozenorb.apiv3.web.route.servers.GETServersId;
import net.frozenorb.apiv3.web.route.servers.POSTServers;
import net.frozenorb.apiv3.web.route.servers.POSTServersHeartbeat;
import net.frozenorb.apiv3.web.route.users.GETStaff;
import net.frozenorb.apiv3.web.route.users.GETUsersId;
import net.frozenorb.apiv3.web.route.users.GETUsersIdCompoundedPermissions;
import net.frozenorb.apiv3.web.route.users.GETUsersIdDetails;
import net.frozenorb.apiv3.web.route.users.GETUsersIdRequiresTotp;
import net.frozenorb.apiv3.web.route.users.GETUsersIdVerifyPassword;
import net.frozenorb.apiv3.web.route.users.POSTUsersIdChangePassword;
import net.frozenorb.apiv3.web.route.users.POSTUsersIdConfirmPhone;
import net.frozenorb.apiv3.web.route.users.POSTUsersIdLogin;
import net.frozenorb.apiv3.web.route.users.POSTUsersIdNotify;
import net.frozenorb.apiv3.web.route.users.POSTUsersIdPasswordReset;
import net.frozenorb.apiv3.web.route.users.POSTUsersIdRegisterEmail;
import net.frozenorb.apiv3.web.route.users.POSTUsersIdRegisterPhone;
import net.frozenorb.apiv3.web.route.users.POSTUsersIdSetupTotp;
import net.frozenorb.apiv3.web.route.users.POSTUsersIdVerifyTotp;
import net.frozenorb.apiv3.web.route.users.POSTUsersUsePasswordResetToken;
import net.frozenorb.apiv3.util.SpringUtils;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.stereotype.Component;
import java.time.Instant;
import java.util.concurrent.TimeUnit;
import io.vertx.core.AbstractVerticle;
import javax.annotation.PostConstruct;
import io.vertx.core.Handler;
import io.vertx.core.Vertx;
import io.vertx.core.http.HttpHeaders;
import io.vertx.core.http.HttpMethod;
import io.vertx.core.http.HttpServer;
import io.vertx.core.http.HttpServerOptions;
import io.vertx.core.net.JksOptions;
import io.vertx.ext.web.Router;
import io.vertx.ext.web.RoutingContext;
import io.vertx.ext.web.handler.BodyHandler;
import io.vertx.ext.web.handler.LoggerFormat;
import io.vertx.ext.web.handler.LoggerHandler;
import io.vertx.ext.web.handler.TimeoutHandler;
import lombok.extern.slf4j.Slf4j;
@Slf4j
@Component
public final class APIv3 extends AbstractVerticle implements ApplicationContextAware {
public final class APIv3 {
private static final Gson gson = new GsonBuilder()
.registerTypeAdapter(Instant.class, new InstantTypeAdapter())
.setExclusionStrategies(new FollowAnnotationExclusionStrategy())
.create();
@Override
public void start() {
@PostConstruct
public void updateCaches() {
BannedAsn.updateCache();
BannedCellCarrier.updateCache();
Rank.updateCache();
Server.updateCache();
ServerGroup.updateCache();
setupHttpServer();
}
@Override
public void setApplicationContext(ApplicationContext applicationContext) {
SpringUtils.setBeanFactory(applicationContext);
}
@Bean
public Vertx vertx() {
return vertx;
}
private void setupHttpServer() {
HttpServerOptions httpServerOptions = new HttpServerOptions();
httpServerOptions.setCompressionSupported(true);
if (!SpringUtils.getProperty("http.keystoreFile").isEmpty()) {
httpServerOptions.setSsl(true);
httpServerOptions.setKeyStoreOptions(
new JksOptions()
.setPassword(SpringUtils.getProperty("http.keystorePassword"))
.setPath(SpringUtils.getProperty("http.keystoreFile"))
);
}
public Router router(Vertx vertx, HttpServerOptions httpServerOptions, @Value("${http.port}") int port) {
HttpServer webServer = vertx.createHttpServer(httpServerOptions);
Router router = Router.router(vertx);
@ -289,8 +253,8 @@ public final class APIv3 extends AbstractVerticle implements ApplicationContextA
httpGet(router, "/whoami", GETWhoAmI.class);
httpPost(router, "/logout", POSTLogout.class);
int port = SpringUtils.getProperty("http.port", Integer.class);
webServer.requestHandler(router::accept).listen(port);
return router;
}
public static void respondJson(RoutingContext ctx, int code, Object response) {
@ -301,7 +265,7 @@ public final class APIv3 extends AbstractVerticle implements ApplicationContextA
ctx.response().end("{}");
} else {
ctx.response().setStatusCode(code);
ctx.response().end(gson.toJson(response));
ctx.response().end(SpringUtils.getBean(Gson.class).toJson(response));
}
}

18
src/main/java/net/frozenorb/apiv3/ApiVerticle.java Normal file
View File

@ -0,0 +1,18 @@
package net.frozenorb.apiv3;
import org.springframework.stereotype.Component;
import javax.annotation.PostConstruct;
import io.vertx.core.AbstractVerticle;
import io.vertx.core.Vertx;
@Component
public final class ApiVerticle extends AbstractVerticle {
@PostConstruct
public void deploy() {
Vertx.vertx().deployVerticle(this);
}
}

21
src/main/java/net/frozenorb/apiv3/Main.java
View File

@ -1,30 +1,25 @@
package net.frozenorb.apiv3;
import org.springframework.beans.factory.annotation.Autowired;
import net.frozenorb.apiv3.util.SpringUtils;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.core.env.Environment;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
import org.springframework.scheduling.annotation.EnableScheduling;
import javax.annotation.PostConstruct;
import io.vertx.core.Vertx;
@SpringBootApplication
@EnableScheduling
public class Main {
@Autowired private APIv3 verticle;
@Autowired private Environment environment;
public class Main implements ApplicationContextAware {
public static void main(String[] args) {
System.setProperty("vertx.logger-delegate-factory-class-name", "io.vertx.core.logging.SLF4JLogDelegateFactory");
SpringApplication.run(Main.class, args);
}
@PostConstruct
public void deployVerticle() {
Vertx.vertx().deployVerticle(verticle);
@Override
public void setApplicationContext(ApplicationContext applicationContext) {
SpringUtils.setBeanFactory(applicationContext);
}
}

25
src/main/java/net/frozenorb/apiv3/config/GsonConfig.java Normal file
View File

@ -0,0 +1,25 @@
package net.frozenorb.apiv3.config;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import net.frozenorb.apiv3.serialization.gson.FollowAnnotationExclusionStrategy;
import net.frozenorb.apiv3.serialization.gson.InstantTypeAdapter;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import java.time.Instant;
@Configuration
public class GsonConfig {
@Bean
public Gson gson() {
return new GsonBuilder()
.registerTypeAdapter(Instant.class, new InstantTypeAdapter())
.setExclusionStrategies(new FollowAnnotationExclusionStrategy())
.create();
}
}

40
src/main/java/net/frozenorb/apiv3/config/VertxConfig.java Normal file
View File

@ -0,0 +1,40 @@
package net.frozenorb.apiv3.config;
import net.frozenorb.apiv3.ApiVerticle;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import io.vertx.core.Vertx;
import io.vertx.core.http.HttpServerOptions;
import io.vertx.core.net.JksOptions;
@Configuration
public class VertxConfig {
@Bean
public Vertx vertx(ApiVerticle apiVerticle) {
return apiVerticle.getVertx();
}
@Bean
public HttpServerOptions httpServerOptions(
@Value("${http.keystorePassword}") String keystorePassword,
@Value("${http.keystoreFile}") String keystoreFile
) {
HttpServerOptions options = new HttpServerOptions();
if (!keystoreFile.isEmpty()) {
options.setSsl(true);
options.setKeyStoreOptions(new JksOptions()
.setPassword(keystorePassword)
.setPath(keystoreFile)
);
}
options.setCompressionSupported(true);
return options;
}
}

4
src/main/java/net/frozenorb/apiv3/model/AccessToken.java → src/main/java/net/frozenorb/apiv3/domain/AccessToken.java
View File

@ -1,4 +1,4 @@
package net.frozenorb.apiv3.model;
package net.frozenorb.apiv3.domain;
import com.google.common.collect.ImmutableList;
@ -6,7 +6,7 @@ import com.mongodb.async.SingleResultCallback;
import com.mongodb.async.client.MongoCollection;
import com.mongodb.async.client.MongoDatabase;
import net.frozenorb.apiv3.actor.ActorType;
import net.frozenorb.apiv3.unsorted.actor.ActorType;
import net.frozenorb.apiv3.unsorted.MongoToVoidMongoCallback;
import net.frozenorb.apiv3.util.SpringUtils;
import net.frozenorb.apiv3.util.SyncUtils;

8
src/main/java/net/frozenorb/apiv3/model/AuditLogEntry.java → src/main/java/net/frozenorb/apiv3/domain/AuditLogEntry.java
View File

@ -1,4 +1,4 @@
package net.frozenorb.apiv3.model;
package net.frozenorb.apiv3.domain;
import com.google.common.collect.ImmutableMap;
@ -6,9 +6,9 @@ import com.mongodb.async.SingleResultCallback;
import com.mongodb.async.client.MongoCollection;
import com.mongodb.async.client.MongoDatabase;
import net.frozenorb.apiv3.actor.Actor;
import net.frozenorb.apiv3.actor.ActorType;
import net.frozenorb.apiv3.auditLog.AuditLogActionType;
import net.frozenorb.apiv3.unsorted.actor.Actor;
import net.frozenorb.apiv3.unsorted.actor.ActorType;
import net.frozenorb.apiv3.service.auditlog.AuditLogActionType;
import net.frozenorb.apiv3.util.SpringUtils;
import net.frozenorb.apiv3.util.SyncUtils;

2
src/main/java/net/frozenorb/apiv3/model/BannedAsn.java → src/main/java/net/frozenorb/apiv3/domain/BannedAsn.java
View File

@ -1,4 +1,4 @@
package net.frozenorb.apiv3.model;
package net.frozenorb.apiv3.domain;
import com.google.common.collect.ImmutableList;

2
src/main/java/net/frozenorb/apiv3/model/BannedCellCarrier.java → src/main/java/net/frozenorb/apiv3/domain/BannedCellCarrier.java
View File

@ -1,5 +1,5 @@
package net.frozenorb.apiv3.model;
package net.frozenorb.apiv3.domain;
import com.google.common.collect.ImmutableList;

2
src/main/java/net/frozenorb/apiv3/model/ChatFilterEntry.java → src/main/java/net/frozenorb/apiv3/domain/ChatFilterEntry.java
View File

@ -1,4 +1,4 @@
package net.frozenorb.apiv3.model;
package net.frozenorb.apiv3.domain;
import com.mongodb.async.SingleResultCallback;
import com.mongodb.async.client.MongoCollection;

2
src/main/java/net/frozenorb/apiv3/model/Grant.java → src/main/java/net/frozenorb/apiv3/domain/Grant.java
View File

@ -1,4 +1,4 @@
package net.frozenorb.apiv3.model;
package net.frozenorb.apiv3.domain;
import com.google.common.collect.Collections2;

6
src/main/java/net/frozenorb/apiv3/model/IpBan.java → src/main/java/net/frozenorb/apiv3/domain/IpBan.java
View File

@ -1,11 +1,11 @@
package net.frozenorb.apiv3.model;
package net.frozenorb.apiv3.domain;
import com.mongodb.async.SingleResultCallback;
import com.mongodb.async.client.MongoCollection;
import com.mongodb.async.client.MongoDatabase;
import net.frozenorb.apiv3.actor.Actor;
import net.frozenorb.apiv3.actor.ActorType;
import net.frozenorb.apiv3.unsorted.actor.Actor;
import net.frozenorb.apiv3.unsorted.actor.ActorType;
import net.frozenorb.apiv3.unsorted.MongoToVoidMongoCallback;
import net.frozenorb.apiv3.util.SpringUtils;
import net.frozenorb.apiv3.util.SyncUtils;

7
src/main/java/net/frozenorb/apiv3/model/IpIntel.java → src/main/java/net/frozenorb/apiv3/domain/IpIntel.java
View File

@ -1,4 +1,4 @@
package net.frozenorb.apiv3.model;
package net.frozenorb.apiv3.domain;
import com.google.common.base.Charsets;
import com.google.common.hash.Hashing;
@ -7,14 +7,13 @@ import com.mongodb.async.SingleResultCallback;
import com.mongodb.async.client.MongoCollection;
import com.mongodb.async.client.MongoDatabase;
import net.frozenorb.apiv3.geoip.GeoIpInfo;
import net.frozenorb.apiv3.geoip.GeoIpService;
import net.frozenorb.apiv3.service.geoip.GeoIpInfo;
import net.frozenorb.apiv3.service.geoip.GeoIpService;
import net.frozenorb.apiv3.util.GeoJsonPoint;
import net.frozenorb.apiv3.util.SpringUtils;
import net.frozenorb.apiv3.util.SyncUtils;
import org.bson.Document;
import org.springframework.core.env.Environment;
import java.time.Instant;
import java.util.ArrayList;

3
src/main/java/net/frozenorb/apiv3/model/IpLogEntry.java → src/main/java/net/frozenorb/apiv3/domain/IpLogEntry.java
View File

@ -1,4 +1,4 @@
package net.frozenorb.apiv3.model;
package net.frozenorb.apiv3.domain;
import com.google.common.base.Charsets;
import com.google.common.hash.Hashing;
@ -13,7 +13,6 @@ import net.frozenorb.apiv3.util.SyncUtils;
import org.bson.Document;
import org.bson.types.ObjectId;
import org.springframework.core.env.Environment;
import java.time.Instant;
import java.util.LinkedList;

2
src/main/java/net/frozenorb/apiv3/model/NotificationTemplate.java → src/main/java/net/frozenorb/apiv3/domain/NotificationTemplate.java
View File

@ -1,4 +1,4 @@
package net.frozenorb.apiv3.model;
package net.frozenorb.apiv3.domain;
import com.mongodb.async.SingleResultCallback;
import com.mongodb.async.client.MongoCollection;

6
src/main/java/net/frozenorb/apiv3/model/PhoneIntel.java → src/main/java/net/frozenorb/apiv3/domain/PhoneIntel.java
View File

@ -1,11 +1,11 @@
package net.frozenorb.apiv3.model;
package net.frozenorb.apiv3.domain;
import com.mongodb.async.SingleResultCallback;
import com.mongodb.async.client.MongoCollection;
import com.mongodb.async.client.MongoDatabase;
import net.frozenorb.apiv3.sms.SmsCarrierInfo;
import net.frozenorb.apiv3.sms.SmsService;
import net.frozenorb.apiv3.service.sms.SmsCarrierInfo;
import net.frozenorb.apiv3.service.sms.SmsService;
import net.frozenorb.apiv3.util.PhoneUtils;
import net.frozenorb.apiv3.util.SpringUtils;
import net.frozenorb.apiv3.util.SyncUtils;

6
src/main/java/net/frozenorb/apiv3/model/Punishment.java → src/main/java/net/frozenorb/apiv3/domain/Punishment.java
View File

@ -1,11 +1,11 @@
package net.frozenorb.apiv3.model;
package net.frozenorb.apiv3.domain;
import com.mongodb.async.SingleResultCallback;
import com.mongodb.async.client.MongoCollection;
import com.mongodb.async.client.MongoDatabase;
import net.frozenorb.apiv3.actor.Actor;
import net.frozenorb.apiv3.actor.ActorType;
import net.frozenorb.apiv3.unsorted.actor.Actor;
import net.frozenorb.apiv3.unsorted.actor.ActorType;
import net.frozenorb.apiv3.unsorted.MongoToVoidMongoCallback;
import net.frozenorb.apiv3.util.SpringUtils;
import net.frozenorb.apiv3.util.SyncUtils;

2
src/main/java/net/frozenorb/apiv3/model/Rank.java → src/main/java/net/frozenorb/apiv3/domain/Rank.java
View File

@ -1,4 +1,4 @@
package net.frozenorb.apiv3.model;
package net.frozenorb.apiv3.domain;
import com.google.common.collect.ImmutableList;

2
src/main/java/net/frozenorb/apiv3/model/Server.java → src/main/java/net/frozenorb/apiv3/domain/Server.java
View File

@ -1,4 +1,4 @@
package net.frozenorb.apiv3.model;
package net.frozenorb.apiv3.domain;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;

2
src/main/java/net/frozenorb/apiv3/model/ServerGroup.java → src/main/java/net/frozenorb/apiv3/domain/ServerGroup.java
View File

@ -1,4 +1,4 @@
package net.frozenorb.apiv3.model;
package net.frozenorb.apiv3.domain;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;

23
src/main/java/net/frozenorb/apiv3/model/User.java → src/main/java/net/frozenorb/apiv3/domain/User.java
View File

@ -1,4 +1,4 @@
package net.frozenorb.apiv3.model;
package net.frozenorb.apiv3.domain;
import com.google.common.base.Charsets;
import com.google.common.collect.Collections2;
@ -14,15 +14,15 @@ import com.mongodb.async.SingleResultCallback;
import com.mongodb.async.client.MongoCollection;
import com.mongodb.async.client.MongoDatabase;
import net.frozenorb.apiv3.geoip.GeoIpInfo;
import net.frozenorb.apiv3.geoip.GeoIpUserType;
import net.frozenorb.apiv3.mojang.MojangService;
import net.frozenorb.apiv3.service.geoip.GeoIpInfo;
import net.frozenorb.apiv3.service.geoip.GeoIpUserType;
import net.frozenorb.apiv3.service.mojang.MojangService;
import net.frozenorb.apiv3.serialization.gson.ExcludeFromReplies;
import net.frozenorb.apiv3.serialization.jackson.UuidJsonDeserializer;
import net.frozenorb.apiv3.serialization.jackson.UuidJsonSerializer;
import net.frozenorb.apiv3.totp.RequiresTotpResult;
import net.frozenorb.apiv3.totp.TotpAuthorizationResult;
import net.frozenorb.apiv3.totp.TotpService;
import net.frozenorb.apiv3.service.totp.RequiresTotpResult;
import net.frozenorb.apiv3.service.totp.TotpAuthorizationResult;
import net.frozenorb.apiv3.service.totp.TotpService;
import net.frozenorb.apiv3.unsorted.MongoToVertxCallback;
import net.frozenorb.apiv3.unsorted.MongoToVoidMongoCallback;
import net.frozenorb.apiv3.unsorted.Permissions;
@ -55,7 +55,9 @@ import io.vertx.core.Future;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.Setter;
import lombok.extern.slf4j.Slf4j;
@Slf4j
@Entity
@AllArgsConstructor
public final class User {
@ -700,7 +702,12 @@ public final class User {
}
Rank grantedRank = Rank.findById(grant.getRank());
grantedRanks.add(grantedRank);
if (grantedRank != null) {
grantedRanks.add(grantedRank);
} else {
log.warn(lastUsername + " (" + id + ") has a grant for a non-existant rank: " + grant.getRank());
}
}
grantedRanks.add(Rank.findById("default"));

4
src/main/java/net/frozenorb/apiv3/auditLog/AuditLog.java → src/main/java/net/frozenorb/apiv3/service/auditlog/AuditLog.java
View File

@ -1,10 +1,10 @@
package net.frozenorb.apiv3.auditLog;
package net.frozenorb.apiv3.service.auditlog;
import com.google.common.collect.ImmutableMap;
import com.mongodb.async.SingleResultCallback;
import net.frozenorb.apiv3.model.AuditLogEntry;
import net.frozenorb.apiv3.domain.AuditLogEntry;
import java.util.Map;
import java.util.UUID;

6
src/main/java/net/frozenorb/apiv3/auditLog/AuditLogActionType.java → src/main/java/net/frozenorb/apiv3/service/auditlog/AuditLogActionType.java
View File

@ -1,9 +1,9 @@
package net.frozenorb.apiv3.auditLog;
package net.frozenorb.apiv3.service.auditlog;
import com.mongodb.async.SingleResultCallback;
import net.frozenorb.apiv3.model.AuditLogEntry;
import net.frozenorb.apiv3.model.Punishment;
import net.frozenorb.apiv3.domain.AuditLogEntry;
import net.frozenorb.apiv3.domain.Punishment;
import java.time.Instant;

4
src/main/java/net/frozenorb/apiv3/disposablelogintoken/DisposableLoginTokenService.java → src/main/java/net/frozenorb/apiv3/service/disposablelogintoken/DisposableLoginTokenService.java
View File

@ -1,8 +1,8 @@
package net.frozenorb.apiv3.disposablelogintoken;
package net.frozenorb.apiv3.service.disposablelogintoken;
import com.mongodb.async.SingleResultCallback;
import net.frozenorb.apiv3.model.User;
import net.frozenorb.apiv3.domain.User;
import org.springframework.stereotype.Service;

4
src/main/java/net/frozenorb/apiv3/disposablelogintoken/RedisDisposableLoginTokenService.java → src/main/java/net/frozenorb/apiv3/service/disposablelogintoken/RedisDisposableLoginTokenService.java
View File

@ -1,8 +1,8 @@
package net.frozenorb.apiv3.disposablelogintoken;
package net.frozenorb.apiv3.service.disposablelogintoken;
import com.mongodb.async.SingleResultCallback;
import net.frozenorb.apiv3.model.User;
import net.frozenorb.apiv3.domain.User;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;

2
src/main/java/net/frozenorb/apiv3/email/EmailService.java → src/main/java/net/frozenorb/apiv3/service/email/EmailService.java
View File

@ -1,4 +1,4 @@
package net.frozenorb.apiv3.email;
package net.frozenorb.apiv3.service.email;
import com.mongodb.async.SingleResultCallback;

2
src/main/java/net/frozenorb/apiv3/email/MandrillEmailService.java → src/main/java/net/frozenorb/apiv3/service/email/MandrillEmailService.java
View File

@ -1,4 +1,4 @@
package net.frozenorb.apiv3.email;
package net.frozenorb.apiv3.service.email;
import com.google.common.net.MediaType;

2
src/main/java/net/frozenorb/apiv3/email/EmailDomainService.java → src/main/java/net/frozenorb/apiv3/service/emaildomain/EmailDomainService.java
View File

@ -1,4 +1,4 @@
package net.frozenorb.apiv3.email;
package net.frozenorb.apiv3.service.emaildomain;
import org.springframework.stereotype.Service;

2
src/main/java/net/frozenorb/apiv3/email/GitHubEmailDomainService.java → src/main/java/net/frozenorb/apiv3/service/emaildomain/GitHubEmailDomainService.java
View File

@ -1,4 +1,4 @@
package net.frozenorb.apiv3.email;
package net.frozenorb.apiv3.service.emaildomain;
import com.google.common.collect.ImmutableSet;

2
src/main/java/net/frozenorb/apiv3/geoip/GeoIpCity.java → src/main/java/net/frozenorb/apiv3/service/geoip/GeoIpCity.java
View File

@ -1,4 +1,4 @@
package net.frozenorb.apiv3.geoip;
package net.frozenorb.apiv3.service.geoip;
import io.vertx.core.json.JsonObject;
import lombok.Getter;

2
src/main/java/net/frozenorb/apiv3/geoip/GeoIpContinent.java → src/main/java/net/frozenorb/apiv3/service/geoip/GeoIpContinent.java
View File

@ -1,4 +1,4 @@
package net.frozenorb.apiv3.geoip;
package net.frozenorb.apiv3.service.geoip;
import io.vertx.core.json.JsonObject;
import lombok.Getter;

2
src/main/java/net/frozenorb/apiv3/geoip/GeoIpCountry.java → src/main/java/net/frozenorb/apiv3/service/geoip/GeoIpCountry.java
View File

@ -1,4 +1,4 @@
package net.frozenorb.apiv3.geoip;
package net.frozenorb.apiv3.service.geoip;
import io.vertx.core.json.JsonObject;
import lombok.Getter;

2
src/main/java/net/frozenorb/apiv3/geoip/GeoIpInfo.java → src/main/java/net/frozenorb/apiv3/service/geoip/GeoIpInfo.java
View File

@ -1,4 +1,4 @@
package net.frozenorb.apiv3.geoip;
package net.frozenorb.apiv3.service.geoip;
import com.google.common.collect.ImmutableList;

2
src/main/java/net/frozenorb/apiv3/geoip/GeoIpLocation.java → src/main/java/net/frozenorb/apiv3/service/geoip/GeoIpLocation.java
View File

@ -1,4 +1,4 @@
package net.frozenorb.apiv3.geoip;
package net.frozenorb.apiv3.service.geoip;
import io.vertx.core.json.JsonObject;
import lombok.Getter;

2
src/main/java/net/frozenorb/apiv3/geoip/GeoIpPostal.java → src/main/java/net/frozenorb/apiv3/service/geoip/GeoIpPostal.java
View File

@ -1,4 +1,4 @@
package net.frozenorb.apiv3.geoip;
package net.frozenorb.apiv3.service.geoip;
import io.vertx.core.json.JsonObject;
import lombok.Getter;

2
src/main/java/net/frozenorb/apiv3/geoip/GeoIpRegisteredCountry.java → src/main/java/net/frozenorb/apiv3/service/geoip/GeoIpRegisteredCountry.java
View File

@ -1,4 +1,4 @@
package net.frozenorb.apiv3.geoip;
package net.frozenorb.apiv3.service.geoip;
import io.vertx.core.json.JsonObject;
import lombok.Getter;

2
src/main/java/net/frozenorb/apiv3/geoip/GeoIpService.java → src/main/java/net/frozenorb/apiv3/service/geoip/GeoIpService.java
View File

@ -1,4 +1,4 @@
package net.frozenorb.apiv3.geoip;
package net.frozenorb.apiv3.service.geoip;
import com.mongodb.async.SingleResultCallback;

2
src/main/java/net/frozenorb/apiv3/geoip/GeoIpSubdivision.java → src/main/java/net/frozenorb/apiv3/service/geoip/GeoIpSubdivision.java
View File

@ -1,4 +1,4 @@
package net.frozenorb.apiv3.geoip;
package net.frozenorb.apiv3.service.geoip;
import io.vertx.core.json.JsonObject;
import lombok.Getter;

2
src/main/java/net/frozenorb/apiv3/geoip/GeoIpTraits.java → src/main/java/net/frozenorb/apiv3/service/geoip/GeoIpTraits.java
View File

@ -1,4 +1,4 @@
package net.frozenorb.apiv3.geoip;
package net.frozenorb.apiv3.service.geoip;
import io.vertx.core.json.JsonObject;
import lombok.Getter;

2
src/main/java/net/frozenorb/apiv3/geoip/GeoIpUserType.java → src/main/java/net/frozenorb/apiv3/service/geoip/GeoIpUserType.java
View File

@ -1,4 +1,4 @@
package net.frozenorb.apiv3.geoip;
package net.frozenorb.apiv3.service.geoip;
import lombok.Getter;

2
src/main/java/net/frozenorb/apiv3/geoip/MaxMindGeoIpService.java → src/main/java/net/frozenorb/apiv3/service/geoip/MaxMindGeoIpService.java
View File

@ -1,4 +1,4 @@
package net.frozenorb.apiv3.geoip;
package net.frozenorb.apiv3.service.geoip;
import com.google.common.base.Charsets;

2
src/main/java/net/frozenorb/apiv3/mojang/HttpMojangService.java → src/main/java/net/frozenorb/apiv3/service/mojang/HttpMojangService.java
View File

@ -1,4 +1,4 @@
package net.frozenorb.apiv3.mojang;
package net.frozenorb.apiv3.service.mojang;
import com.mongodb.async.SingleResultCallback;

2
src/main/java/net/frozenorb/apiv3/mojang/MojangService.java → src/main/java/net/frozenorb/apiv3/service/mojang/MojangService.java
View File

@ -1,4 +1,4 @@
package net.frozenorb.apiv3.mojang;
package net.frozenorb.apiv3.service.mojang;
import com.mongodb.async.SingleResultCallback;

2
src/main/java/net/frozenorb/apiv3/sms/SmsCarrierInfo.java → src/main/java/net/frozenorb/apiv3/service/sms/SmsCarrierInfo.java
View File

@ -1,4 +1,4 @@
package net.frozenorb.apiv3.sms;
package net.frozenorb.apiv3.service.sms;
import io.vertx.core.json.JsonObject;
import lombok.Getter;

2
src/main/java/net/frozenorb/apiv3/sms/SmsService.java → src/main/java/net/frozenorb/apiv3/service/sms/SmsService.java
View File

@ -1,4 +1,4 @@
package net.frozenorb.apiv3.sms;
package net.frozenorb.apiv3.service.sms;
import com.mongodb.async.SingleResultCallback;

2
src/main/java/net/frozenorb/apiv3/sms/ZangSmsService.java → src/main/java/net/frozenorb/apiv3/service/sms/ZangSmsService.java
View File

@ -1,4 +1,4 @@
package net.frozenorb.apiv3.sms;
package net.frozenorb.apiv3.service.sms;
import com.google.common.base.Charsets;
import com.google.common.net.MediaType;

4
src/main/java/net/frozenorb/apiv3/totp/RedisTotpService.java → src/main/java/net/frozenorb/apiv3/service/totp/RedisTotpService.java
View File

@ -1,10 +1,10 @@
package net.frozenorb.apiv3.totp;
package net.frozenorb.apiv3.service.totp;
import com.mongodb.async.SingleResultCallback;
import com.warrenstrange.googleauth.GoogleAuthenticator;
import com.warrenstrange.googleauth.GoogleAuthenticatorConfig;
import net.frozenorb.apiv3.model.User;
import net.frozenorb.apiv3.domain.User;
import net.frozenorb.apiv3.util.IpUtils;
import org.springframework.beans.factory.annotation.Autowired;

2
src/main/java/net/frozenorb/apiv3/totp/RequiresTotpResult.java → src/main/java/net/frozenorb/apiv3/service/totp/RequiresTotpResult.java
View File

@ -1,4 +1,4 @@
package net.frozenorb.apiv3.totp;
package net.frozenorb.apiv3.service.totp;
public enum RequiresTotpResult {

2
src/main/java/net/frozenorb/apiv3/totp/TotpAuthorizationResult.java → src/main/java/net/frozenorb/apiv3/service/totp/TotpAuthorizationResult.java
View File

@ -1,4 +1,4 @@
package net.frozenorb.apiv3.totp;
package net.frozenorb.apiv3.service.totp;
import lombok.Getter;

4
src/main/java/net/frozenorb/apiv3/totp/TotpService.java → src/main/java/net/frozenorb/apiv3/service/totp/TotpService.java
View File

@ -1,8 +1,8 @@
package net.frozenorb.apiv3.totp;
package net.frozenorb.apiv3.service.totp;
import com.mongodb.async.SingleResultCallback;
import net.frozenorb.apiv3.model.User;
import net.frozenorb.apiv3.domain.User;
import org.springframework.stereotype.Service;

2
src/main/java/net/frozenorb/apiv3/usersession/RedisUserSessionService.java → src/main/java/net/frozenorb/apiv3/service/usersession/RedisUserSessionService.java
View File

@ -1,4 +1,4 @@
package net.frozenorb.apiv3.usersession;
package net.frozenorb.apiv3.service.usersession;
import com.mongodb.async.SingleResultCallback;

2
src/main/java/net/frozenorb/apiv3/usersession/UserSessionService.java → src/main/java/net/frozenorb/apiv3/service/usersession/UserSessionService.java
View File

@ -1,4 +1,4 @@
package net.frozenorb.apiv3.usersession;
package net.frozenorb.apiv3.service.usersession;
import com.mongodb.async.SingleResultCallback;

2
src/main/java/net/frozenorb/apiv3/unsorted/Notification.java
View File

@ -1,6 +1,6 @@
package net.frozenorb.apiv3.unsorted;
import net.frozenorb.apiv3.model.NotificationTemplate;
import net.frozenorb.apiv3.domain.NotificationTemplate;
import java.util.Map;

2
src/main/java/net/frozenorb/apiv3/actor/Actor.java → src/main/java/net/frozenorb/apiv3/unsorted/actor/Actor.java
View File

@ -1,4 +1,4 @@
package net.frozenorb.apiv3.actor;
package net.frozenorb.apiv3.unsorted.actor;
public interface Actor {

2
src/main/java/net/frozenorb/apiv3/actor/ActorType.java → src/main/java/net/frozenorb/apiv3/unsorted/actor/ActorType.java
View File

@ -1,4 +1,4 @@
package net.frozenorb.apiv3.actor;
package net.frozenorb.apiv3.unsorted.actor;
public enum ActorType {

2
src/main/java/net/frozenorb/apiv3/actor/SimpleActor.java → src/main/java/net/frozenorb/apiv3/unsorted/actor/SimpleActor.java
View File

@ -1,4 +1,4 @@
package net.frozenorb.apiv3.actor;
package net.frozenorb.apiv3.unsorted.actor;
import lombok.AllArgsConstructor;
import lombok.Getter;

2
src/main/java/net/frozenorb/apiv3/util/GeoJsonPoint.java
View File

@ -1,6 +1,6 @@
package net.frozenorb.apiv3.util;
import net.frozenorb.apiv3.geoip.GeoIpLocation;
import net.frozenorb.apiv3.service.geoip.GeoIpLocation;
public final class GeoJsonPoint {

2
src/main/java/net/frozenorb/apiv3/util/PermissionUtils.java
View File

@ -3,7 +3,7 @@ package net.frozenorb.apiv3.util;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import net.frozenorb.apiv3.model.Rank;
import net.frozenorb.apiv3.domain.Rank;
import java.util.HashMap;
import java.util.LinkedList;

4
src/main/java/net/frozenorb/apiv3/util/SpringUtils.java
View File

@ -18,8 +18,4 @@ public final class SpringUtils {
return beanFactory.getBean(Environment.class).getProperty(key);
}
public static <T> T getProperty(String key, Class<T> type) {
return beanFactory.getBean(Environment.class).getProperty(key, type);
}
}

8
src/main/java/net/frozenorb/apiv3/filter/AuthenticationFilter.java → src/main/java/net/frozenorb/apiv3/web/filter/AuthenticationFilter.java
View File

@ -1,10 +1,10 @@
package net.frozenorb.apiv3.filter;
package net.frozenorb.apiv3.web.filter;
import com.google.common.collect.ImmutableMap;
import net.frozenorb.apiv3.actor.ActorType;
import net.frozenorb.apiv3.actor.SimpleActor;
import net.frozenorb.apiv3.model.AccessToken;
import net.frozenorb.apiv3.unsorted.actor.ActorType;
import net.frozenorb.apiv3.unsorted.actor.SimpleActor;
import net.frozenorb.apiv3.domain.AccessToken;
import net.frozenorb.apiv3.util.ErrorUtils;
import org.springframework.stereotype.Component;

4
src/main/java/net/frozenorb/apiv3/filter/AuthorizationFilter.java → src/main/java/net/frozenorb/apiv3/web/filter/AuthorizationFilter.java
View File

@ -1,8 +1,8 @@
package net.frozenorb.apiv3.filter;
package net.frozenorb.apiv3.web.filter;
import com.google.common.collect.ImmutableMap;
import net.frozenorb.apiv3.actor.Actor;
import net.frozenorb.apiv3.unsorted.actor.Actor;
import net.frozenorb.apiv3.util.ErrorUtils;
import org.springframework.stereotype.Component;

2
src/main/java/net/frozenorb/apiv3/filter/MetricsFilter.java → src/main/java/net/frozenorb/apiv3/web/filter/MetricsFilter.java
View File

@ -1,4 +1,4 @@
package net.frozenorb.apiv3.filter;
package net.frozenorb.apiv3.web.filter;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

8
src/main/java/net/frozenorb/apiv3/filter/WebsiteUserSessionFilter.java → src/main/java/net/frozenorb/apiv3/web/filter/WebsiteUserSessionFilter.java
View File

@ -1,10 +1,10 @@
package net.frozenorb.apiv3.filter;
package net.frozenorb.apiv3.web.filter;
import com.google.common.collect.ImmutableMap;
import net.frozenorb.apiv3.actor.Actor;
import net.frozenorb.apiv3.actor.ActorType;
import net.frozenorb.apiv3.usersession.UserSessionService;
import net.frozenorb.apiv3.unsorted.actor.Actor;
import net.frozenorb.apiv3.unsorted.actor.ActorType;
import net.frozenorb.apiv3.service.usersession.UserSessionService;
import net.frozenorb.apiv3.util.ErrorUtils;
import net.frozenorb.apiv3.util.IpUtils;

22
src/main/java/net/frozenorb/apiv3/route/GETDumpsType.java → src/main/java/net/frozenorb/apiv3/web/route/GETDumpsType.java
View File

@ -1,20 +1,20 @@
package net.frozenorb.apiv3.route;
package net.frozenorb.apiv3.web.route;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
import net.frozenorb.apiv3.APIv3;
import net.frozenorb.apiv3.actor.Actor;
import net.frozenorb.apiv3.actor.ActorType;
import net.frozenorb.apiv3.model.Grant;
import net.frozenorb.apiv3.model.IpBan;
import net.frozenorb.apiv3.model.IpIntel;
import net.frozenorb.apiv3.model.Punishment;
import net.frozenorb.apiv3.model.Rank;
import net.frozenorb.apiv3.model.Server;
import net.frozenorb.apiv3.model.ServerGroup;
import net.frozenorb.apiv3.model.User;
import net.frozenorb.apiv3.unsorted.actor.Actor;
import net.frozenorb.apiv3.unsorted.actor.ActorType;
import net.frozenorb.apiv3.domain.Grant;
import net.frozenorb.apiv3.domain.IpBan;
import net.frozenorb.apiv3.domain.IpIntel;
import net.frozenorb.apiv3.domain.Punishment;
import net.frozenorb.apiv3.domain.Rank;
import net.frozenorb.apiv3.domain.Server;
import net.frozenorb.apiv3.domain.ServerGroup;
import net.frozenorb.apiv3.domain.User;
import net.frozenorb.apiv3.util.ErrorUtils;
import net.frozenorb.apiv3.util.GeoJsonPoint;

4
src/main/java/net/frozenorb/apiv3/route/GETSearch.java → src/main/java/net/frozenorb/apiv3/web/route/GETSearch.java
View File

@ -1,7 +1,7 @@
package net.frozenorb.apiv3.route;
package net.frozenorb.apiv3.web.route;
import net.frozenorb.apiv3.APIv3;
import net.frozenorb.apiv3.model.User;
import net.frozenorb.apiv3.domain.User;
import net.frozenorb.apiv3.util.ErrorUtils;
import net.frozenorb.apiv3.util.SyncUtils;

4
src/main/java/net/frozenorb/apiv3/route/GETWhoAmI.java → src/main/java/net/frozenorb/apiv3/web/route/GETWhoAmI.java
View File

@ -1,9 +1,9 @@
package net.frozenorb.apiv3.route;
package net.frozenorb.apiv3.web.route;
import com.google.common.collect.ImmutableMap;
import net.frozenorb.apiv3.APIv3;
import net.frozenorb.apiv3.actor.Actor;
import net.frozenorb.apiv3.unsorted.actor.Actor;
import org.springframework.stereotype.Component;

4
src/main/java/net/frozenorb/apiv3/route/POSTLogout.java → src/main/java/net/frozenorb/apiv3/web/route/POSTLogout.java
View File

@ -1,9 +1,9 @@
package net.frozenorb.apiv3.route;
package net.frozenorb.apiv3.web.route;
import com.google.common.collect.ImmutableMap;
import net.frozenorb.apiv3.APIv3;
import net.frozenorb.apiv3.usersession.UserSessionService;
import net.frozenorb.apiv3.service.usersession.UserSessionService;
import net.frozenorb.apiv3.util.ErrorUtils;
import org.springframework.beans.factory.annotation.Autowired;

8
src/main/java/net/frozenorb/apiv3/route/accessTokens/DELETEAccessTokensId.java → src/main/java/net/frozenorb/apiv3/web/route/accessTokens/DELETEAccessTokensId.java
View File

@ -1,11 +1,11 @@
package net.frozenorb.apiv3.route.accessTokens;
package net.frozenorb.apiv3.web.route.accessTokens;
import com.google.common.collect.ImmutableMap;
import net.frozenorb.apiv3.APIv3;
import net.frozenorb.apiv3.auditLog.AuditLog;
import net.frozenorb.apiv3.auditLog.AuditLogActionType;
import net.frozenorb.apiv3.model.AccessToken;
import net.frozenorb.apiv3.service.auditlog.AuditLog;
import net.frozenorb.apiv3.service.auditlog.AuditLogActionType;
import net.frozenorb.apiv3.domain.AccessToken;
import net.frozenorb.apiv3.util.ErrorUtils;
import net.frozenorb.apiv3.util.SyncUtils;
import net.frozenorb.apiv3.util.UuidUtils;

8
src/main/java/net/frozenorb/apiv3/route/accessTokens/GETAccessTokens.java → src/main/java/net/frozenorb/apiv3/web/route/accessTokens/GETAccessTokens.java
View File

@ -1,9 +1,9 @@
package net.frozenorb.apiv3.route.accessTokens;
package net.frozenorb.apiv3.web.route.accessTokens;
import net.frozenorb.apiv3.APIv3;
import net.frozenorb.apiv3.model.AccessToken;
import net.frozenorb.apiv3.model.User;
import net.frozenorb.apiv3.totp.TotpAuthorizationResult;
import net.frozenorb.apiv3.domain.AccessToken;
import net.frozenorb.apiv3.domain.User;
import net.frozenorb.apiv3.service.totp.TotpAuthorizationResult;
import net.frozenorb.apiv3.util.ErrorUtils;
import net.frozenorb.apiv3.util.SyncUtils;

4
src/main/java/net/frozenorb/apiv3/route/accessTokens/GETAccessTokensId.java → src/main/java/net/frozenorb/apiv3/web/route/accessTokens/GETAccessTokensId.java
View File

@ -1,7 +1,7 @@
package net.frozenorb.apiv3.route.accessTokens;
package net.frozenorb.apiv3.web.route.accessTokens;
import net.frozenorb.apiv3.APIv3;
import net.frozenorb.apiv3.model.AccessToken;
import net.frozenorb.apiv3.domain.AccessToken;
import net.frozenorb.apiv3.util.ErrorUtils;
import org.springframework.stereotype.Component;

14
src/main/java/net/frozenorb/apiv3/route/accessTokens/POSTAccessTokens.java → src/main/java/net/frozenorb/apiv3/web/route/accessTokens/POSTAccessTokens.java
View File

@ -1,14 +1,14 @@
package net.frozenorb.apiv3.route.accessTokens;
package net.frozenorb.apiv3.web.route.accessTokens;
import com.google.common.collect.ImmutableMap;
import net.frozenorb.apiv3.APIv3;
import net.frozenorb.apiv3.actor.ActorType;
import net.frozenorb.apiv3.auditLog.AuditLog;
import net.frozenorb.apiv3.auditLog.AuditLogActionType;
import net.frozenorb.apiv3.model.AccessToken;
import net.frozenorb.apiv3.model.User;
import net.frozenorb.apiv3.totp.TotpAuthorizationResult;
import net.frozenorb.apiv3.unsorted.actor.ActorType;
import net.frozenorb.apiv3.service.auditlog.AuditLog;
import net.frozenorb.apiv3.service.auditlog.AuditLogActionType;
import net.frozenorb.apiv3.domain.AccessToken;
import net.frozenorb.apiv3.domain.User;
import net.frozenorb.apiv3.service.totp.TotpAuthorizationResult;
import net.frozenorb.apiv3.util.ErrorUtils;
import net.frozenorb.apiv3.util.SyncUtils;

8
src/main/java/net/frozenorb/apiv3/route/auditLog/DELETEAuditLogId.java → src/main/java/net/frozenorb/apiv3/web/route/auditLog/DELETEAuditLogId.java
View File

@ -1,11 +1,11 @@
package net.frozenorb.apiv3.route.auditLog;
package net.frozenorb.apiv3.web.route.auditLog;
import com.google.common.collect.ImmutableMap;
import net.frozenorb.apiv3.APIv3;
import net.frozenorb.apiv3.auditLog.AuditLog;
import net.frozenorb.apiv3.auditLog.AuditLogActionType;
import net.frozenorb.apiv3.model.AuditLogEntry;
import net.frozenorb.apiv3.service.auditlog.AuditLog;
import net.frozenorb.apiv3.service.auditlog.AuditLogActionType;
import net.frozenorb.apiv3.domain.AuditLogEntry;
import net.frozenorb.apiv3.util.ErrorUtils;
import net.frozenorb.apiv3.util.SyncUtils;
import net.frozenorb.apiv3.util.UuidUtils;

4
src/main/java/net/frozenorb/apiv3/route/auditLog/GETAuditLog.java → src/main/java/net/frozenorb/apiv3/web/route/auditLog/GETAuditLog.java
View File

@ -1,7 +1,7 @@
package net.frozenorb.apiv3.route.auditLog;
package net.frozenorb.apiv3.web.route.auditLog;
import net.frozenorb.apiv3.APIv3;
import net.frozenorb.apiv3.model.AuditLogEntry;
import net.frozenorb.apiv3.domain.AuditLogEntry;
import net.frozenorb.apiv3.util.ErrorUtils;
import net.frozenorb.apiv3.util.UuidUtils;

8
src/main/java/net/frozenorb/apiv3/route/auditLog/POSTAuditLog.java → src/main/java/net/frozenorb/apiv3/web/route/auditLog/POSTAuditLog.java
View File

@ -1,9 +1,9 @@
package net.frozenorb.apiv3.route.auditLog;
package net.frozenorb.apiv3.web.route.auditLog;
import net.frozenorb.apiv3.APIv3;
import net.frozenorb.apiv3.auditLog.AuditLog;
import net.frozenorb.apiv3.auditLog.AuditLogActionType;
import net.frozenorb.apiv3.model.User;
import net.frozenorb.apiv3.service.auditlog.AuditLog;
import net.frozenorb.apiv3.service.auditlog.AuditLogActionType;
import net.frozenorb.apiv3.domain.User;
import net.frozenorb.apiv3.util.ErrorUtils;
import net.frozenorb.apiv3.util.IpUtils;

8
src/main/java/net/frozenorb/apiv3/route/bannedAsns/DELETEBannedAsnsId.java → src/main/java/net/frozenorb/apiv3/web/route/bannedAsns/DELETEBannedAsnsId.java
View File

@ -1,11 +1,11 @@
package net.frozenorb.apiv3.route.bannedAsns;
package net.frozenorb.apiv3.web.route.bannedAsns;
import com.google.common.collect.ImmutableMap;
import net.frozenorb.apiv3.APIv3;
import net.frozenorb.apiv3.auditLog.AuditLog;
import net.frozenorb.apiv3.auditLog.AuditLogActionType;
import net.frozenorb.apiv3.model.BannedAsn;
import net.frozenorb.apiv3.service.auditlog.AuditLog;
import net.frozenorb.apiv3.service.auditlog.AuditLogActionType;
import net.frozenorb.apiv3.domain.BannedAsn;
import net.frozenorb.apiv3.util.ErrorUtils;
import net.frozenorb.apiv3.util.SyncUtils;
import net.frozenorb.apiv3.util.UuidUtils;

4
src/main/java/net/frozenorb/apiv3/route/bannedAsns/GETBannedAsns.java → src/main/java/net/frozenorb/apiv3/web/route/bannedAsns/GETBannedAsns.java
View File

@ -1,7 +1,7 @@
package net.frozenorb.apiv3.route.bannedAsns;
package net.frozenorb.apiv3.web.route.bannedAsns;
import net.frozenorb.apiv3.APIv3;
import net.frozenorb.apiv3.model.BannedAsn;
import net.frozenorb.apiv3.domain.BannedAsn;
import org.springframework.stereotype.Component;

4
src/main/java/net/frozenorb/apiv3/route/bannedAsns/GETBannedAsnsId.java → src/main/java/net/frozenorb/apiv3/web/route/bannedAsns/GETBannedAsnsId.java
View File

@ -1,7 +1,7 @@
package net.frozenorb.apiv3.route.bannedAsns;
package net.frozenorb.apiv3.web.route.bannedAsns;
import net.frozenorb.apiv3.APIv3;
import net.frozenorb.apiv3.model.BannedAsn;
import net.frozenorb.apiv3.domain.BannedAsn;
import org.springframework.stereotype.Component;

8
src/main/java/net/frozenorb/apiv3/route/bannedAsns/POSTBannedAsns.java → src/main/java/net/frozenorb/apiv3/web/route/bannedAsns/POSTBannedAsns.java
View File

@ -1,11 +1,11 @@
package net.frozenorb.apiv3.route.bannedAsns;
package net.frozenorb.apiv3.web.route.bannedAsns;
import com.google.common.collect.ImmutableMap;
import net.frozenorb.apiv3.APIv3;
import net.frozenorb.apiv3.auditLog.AuditLog;
import net.frozenorb.apiv3.auditLog.AuditLogActionType;
import net.frozenorb.apiv3.model.BannedAsn;
import net.frozenorb.apiv3.service.auditlog.AuditLog;
import net.frozenorb.apiv3.service.auditlog.AuditLogActionType;
import net.frozenorb.apiv3.domain.BannedAsn;
import net.frozenorb.apiv3.util.ErrorUtils;
import net.frozenorb.apiv3.util.SyncUtils;
import net.frozenorb.apiv3.util.UuidUtils;

2
src/main/java/net/frozenorb/apiv3/route/bannedAsns/PUTBannedAsnsId.java → src/main/java/net/frozenorb/apiv3/web/route/bannedAsns/PUTBannedAsnsId.java
View File

@ -1,4 +1,4 @@
package net.frozenorb.apiv3.route.bannedAsns;
package net.frozenorb.apiv3.web.route.bannedAsns;
import org.springframework.stereotype.Component;

8
src/main/java/net/frozenorb/apiv3/route/bannedCellCarriers/DELETEBannedCellCarriersId.java → src/main/java/net/frozenorb/apiv3/web/route/bannedCellCarriers/DELETEBannedCellCarriersId.java
View File

@ -1,11 +1,11 @@
package net.frozenorb.apiv3.route.bannedCellCarriers;
package net.frozenorb.apiv3.web.route.bannedCellCarriers;
import com.google.common.collect.ImmutableMap;
import net.frozenorb.apiv3.APIv3;
import net.frozenorb.apiv3.auditLog.AuditLog;
import net.frozenorb.apiv3.auditLog.AuditLogActionType;
import net.frozenorb.apiv3.model.BannedCellCarrier;
import net.frozenorb.apiv3.service.auditlog.AuditLog;
import net.frozenorb.apiv3.service.auditlog.AuditLogActionType;
import net.frozenorb.apiv3.domain.BannedCellCarrier;
import net.frozenorb.apiv3.util.ErrorUtils;
import net.frozenorb.apiv3.util.SyncUtils;
import net.frozenorb.apiv3.util.UuidUtils;

4
src/main/java/net/frozenorb/apiv3/route/bannedCellCarriers/GETBannedCellCarriers.java → src/main/java/net/frozenorb/apiv3/web/route/bannedCellCarriers/GETBannedCellCarriers.java
View File

@ -1,7 +1,7 @@
package net.frozenorb.apiv3.route.bannedCellCarriers;
package net.frozenorb.apiv3.web.route.bannedCellCarriers;
import net.frozenorb.apiv3.APIv3;
import net.frozenorb.apiv3.model.BannedCellCarrier;
import net.frozenorb.apiv3.domain.BannedCellCarrier;
import org.springframework.stereotype.Component;

4
src/main/java/net/frozenorb/apiv3/route/bannedCellCarriers/GETBannedCellCarriersId.java → src/main/java/net/frozenorb/apiv3/web/route/bannedCellCarriers/GETBannedCellCarriersId.java
View File

@ -1,7 +1,7 @@
package net.frozenorb.apiv3.route.bannedCellCarriers;
package net.frozenorb.apiv3.web.route.bannedCellCarriers;
import net.frozenorb.apiv3.APIv3;
import net.frozenorb.apiv3.model.BannedCellCarrier;
import net.frozenorb.apiv3.domain.BannedCellCarrier;
import org.springframework.stereotype.Component;

8
src/main/java/net/frozenorb/apiv3/route/bannedCellCarriers/POSTBannedCellCarriers.java → src/main/java/net/frozenorb/apiv3/web/route/bannedCellCarriers/POSTBannedCellCarriers.java
View File

@ -1,11 +1,11 @@
package net.frozenorb.apiv3.route.bannedCellCarriers;
package net.frozenorb.apiv3.web.route.bannedCellCarriers;
import com.google.common.collect.ImmutableMap;
import net.frozenorb.apiv3.APIv3;
import net.frozenorb.apiv3.auditLog.AuditLog;
import net.frozenorb.apiv3.auditLog.AuditLogActionType;
import net.frozenorb.apiv3.model.BannedCellCarrier;
import net.frozenorb.apiv3.service.auditlog.AuditLog;
import net.frozenorb.apiv3.service.auditlog.AuditLogActionType;
import net.frozenorb.apiv3.domain.BannedCellCarrier;
import net.frozenorb.apiv3.util.ErrorUtils;
import net.frozenorb.apiv3.util.SyncUtils;
import net.frozenorb.apiv3.util.UuidUtils;

2
src/main/java/net/frozenorb/apiv3/route/bannedCellCarriers/PUTBannedCellCarriersId.java → src/main/java/net/frozenorb/apiv3/web/route/bannedCellCarriers/PUTBannedCellCarriersId.java
View File

@ -1,4 +1,4 @@
package net.frozenorb.apiv3.route.bannedCellCarriers;
package net.frozenorb.apiv3.web.route.bannedCellCarriers;
import org.springframework.stereotype.Component;

8
src/main/java/net/frozenorb/apiv3/route/chatFilter/DELETEChatFilterId.java → src/main/java/net/frozenorb/apiv3/web/route/chatFilter/DELETEChatFilterId.java
View File

@ -1,11 +1,11 @@
package net.frozenorb.apiv3.route.chatFilter;
package net.frozenorb.apiv3.web.route.chatFilter;
import com.google.common.collect.ImmutableMap;
import net.frozenorb.apiv3.APIv3;
import net.frozenorb.apiv3.auditLog.AuditLog;
import net.frozenorb.apiv3.auditLog.AuditLogActionType;
import net.frozenorb.apiv3.model.ChatFilterEntry;
import net.frozenorb.apiv3.service.auditlog.AuditLog;
import net.frozenorb.apiv3.service.auditlog.AuditLogActionType;
import net.frozenorb.apiv3.domain.ChatFilterEntry;
import net.frozenorb.apiv3.util.ErrorUtils;
import net.frozenorb.apiv3.util.SyncUtils;
import net.frozenorb.apiv3.util.UuidUtils;

4
src/main/java/net/frozenorb/apiv3/route/chatFilter/GETChatFilter.java → src/main/java/net/frozenorb/apiv3/web/route/chatFilter/GETChatFilter.java
View File

@ -1,7 +1,7 @@
package net.frozenorb.apiv3.route.chatFilter;
package net.frozenorb.apiv3.web.route.chatFilter;
import net.frozenorb.apiv3.APIv3;
import net.frozenorb.apiv3.model.ChatFilterEntry;
import net.frozenorb.apiv3.domain.ChatFilterEntry;
import net.frozenorb.apiv3.util.ErrorUtils;
import org.springframework.stereotype.Component;

4
src/main/java/net/frozenorb/apiv3/route/chatFilter/GETChatFilterId.java → src/main/java/net/frozenorb/apiv3/web/route/chatFilter/GETChatFilterId.java
View File

@ -1,7 +1,7 @@
package net.frozenorb.apiv3.route.chatFilter;
package net.frozenorb.apiv3.web.route.chatFilter;
import net.frozenorb.apiv3.APIv3;
import net.frozenorb.apiv3.model.ChatFilterEntry;
import net.frozenorb.apiv3.domain.ChatFilterEntry;
import net.frozenorb.apiv3.util.ErrorUtils;
import org.springframework.stereotype.Component;

8
src/main/java/net/frozenorb/apiv3/route/chatFilter/POSTChatFilter.java → src/main/java/net/frozenorb/apiv3/web/route/chatFilter/POSTChatFilter.java
View File

@ -1,11 +1,11 @@
package net.frozenorb.apiv3.route.chatFilter;
package net.frozenorb.apiv3.web.route.chatFilter;
import com.google.common.collect.ImmutableMap;
import net.frozenorb.apiv3.APIv3;
import net.frozenorb.apiv3.auditLog.AuditLog;
import net.frozenorb.apiv3.auditLog.AuditLogActionType;
import net.frozenorb.apiv3.model.ChatFilterEntry;
import net.frozenorb.apiv3.service.auditlog.AuditLog;
import net.frozenorb.apiv3.service.auditlog.AuditLogActionType;
import net.frozenorb.apiv3.domain.ChatFilterEntry;
import net.frozenorb.apiv3.util.ErrorUtils;
import net.frozenorb.apiv3.util.SyncUtils;
import net.frozenorb.apiv3.util.UuidUtils;

2
src/main/java/net/frozenorb/apiv3/route/chatFilter/PUTChatFilterId.java → src/main/java/net/frozenorb/apiv3/web/route/chatFilter/PUTChatFilterId.java
View File

@ -1,4 +1,4 @@
package net.frozenorb.apiv3.route.chatFilter;
package net.frozenorb.apiv3.web.route.chatFilter;
import org.springframework.stereotype.Component;

12
src/main/java/net/frozenorb/apiv3/route/deployment/POSTDeploymentUpdateServer.java → src/main/java/net/frozenorb/apiv3/web/route/deployment/POSTDeploymentUpdateServer.java
View File

@ -1,13 +1,13 @@
package net.frozenorb.apiv3.route.deployment;
package net.frozenorb.apiv3.web.route.deployment;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import net.frozenorb.apiv3.actor.Actor;
import net.frozenorb.apiv3.actor.ActorType;
import net.frozenorb.apiv3.model.AccessToken;
import net.frozenorb.apiv3.model.Server;
import net.frozenorb.apiv3.model.ServerGroup;
import net.frozenorb.apiv3.unsorted.actor.Actor;
import net.frozenorb.apiv3.unsorted.actor.ActorType;
import net.frozenorb.apiv3.domain.AccessToken;
import net.frozenorb.apiv3.domain.Server;
import net.frozenorb.apiv3.domain.ServerGroup;
import net.frozenorb.apiv3.util.ErrorUtils;
import net.frozenorb.apiv3.util.SyncUtils;

6
src/main/java/net/frozenorb/apiv3/route/disposableLoginTokens/POSTDisposableLoginTokens.java → src/main/java/net/frozenorb/apiv3/web/route/disposableLoginTokens/POSTDisposableLoginTokens.java
View File

@ -1,10 +1,10 @@
package net.frozenorb.apiv3.route.disposableLoginTokens;
package net.frozenorb.apiv3.web.route.disposableLoginTokens;
import com.google.common.collect.ImmutableMap;
import net.frozenorb.apiv3.APIv3;
import net.frozenorb.apiv3.disposablelogintoken.DisposableLoginTokenService;
import net.frozenorb.apiv3.model.User;
import net.frozenorb.apiv3.service.disposablelogintoken.DisposableLoginTokenService;
import net.frozenorb.apiv3.domain.User;
import net.frozenorb.apiv3.util.ErrorUtils;
import net.frozenorb.apiv3.util.IpUtils;
import net.frozenorb.apiv3.util.SyncUtils;

10
src/main/java/net/frozenorb/apiv3/route/disposableLoginTokens/POSTDisposableLoginTokensIdUse.java → src/main/java/net/frozenorb/apiv3/web/route/disposableLoginTokens/POSTDisposableLoginTokensIdUse.java
View File

@ -1,12 +1,12 @@
package net.frozenorb.apiv3.route.disposableLoginTokens;
package net.frozenorb.apiv3.web.route.disposableLoginTokens;
import com.google.common.collect.ImmutableMap;
import net.frozenorb.apiv3.APIv3;
import net.frozenorb.apiv3.auditLog.AuditLog;
import net.frozenorb.apiv3.auditLog.AuditLogActionType;
import net.frozenorb.apiv3.disposablelogintoken.DisposableLoginTokenService;
import net.frozenorb.apiv3.usersession.UserSessionService;
import net.frozenorb.apiv3.service.auditlog.AuditLog;
import net.frozenorb.apiv3.service.auditlog.AuditLogActionType;
import net.frozenorb.apiv3.service.disposablelogintoken.DisposableLoginTokenService;
import net.frozenorb.apiv3.service.usersession.UserSessionService;
import net.frozenorb.apiv3.util.ErrorUtils;
import net.frozenorb.apiv3.util.IpUtils;
import net.frozenorb.apiv3.util.SyncUtils;

4
src/main/java/net/frozenorb/apiv3/route/emailTokens/GETEmailTokensIdOwner.java → src/main/java/net/frozenorb/apiv3/web/route/emailTokens/GETEmailTokensIdOwner.java
View File

@ -1,7 +1,7 @@
package net.frozenorb.apiv3.route.emailTokens;
package net.frozenorb.apiv3.web.route.emailTokens;
import net.frozenorb.apiv3.APIv3;
import net.frozenorb.apiv3.model.User;
import net.frozenorb.apiv3.domain.User;
import net.frozenorb.apiv3.util.ErrorUtils;
import org.springframework.stereotype.Component;

8
src/main/java/net/frozenorb/apiv3/route/emailTokens/POSTEmailTokensIdConfirm.java → src/main/java/net/frozenorb/apiv3/web/route/emailTokens/POSTEmailTokensIdConfirm.java
View File

@ -1,11 +1,11 @@
package net.frozenorb.apiv3.route.emailTokens;
package net.frozenorb.apiv3.web.route.emailTokens;
import com.google.common.collect.ImmutableMap;
import net.frozenorb.apiv3.APIv3;
import net.frozenorb.apiv3.auditLog.AuditLog;
import net.frozenorb.apiv3.auditLog.AuditLogActionType;
import net.frozenorb.apiv3.model.User;
import net.frozenorb.apiv3.service.auditlog.AuditLog;
import net.frozenorb.apiv3.service.auditlog.AuditLogActionType;
import net.frozenorb.apiv3.domain.User;
import net.frozenorb.apiv3.util.ErrorUtils;
import net.frozenorb.apiv3.util.IpUtils;
import net.frozenorb.apiv3.util.PasswordUtils;

10
src/main/java/net/frozenorb/apiv3/route/grants/DELETEGrantsId.java → src/main/java/net/frozenorb/apiv3/web/route/grants/DELETEGrantsId.java
View File

@ -1,12 +1,12 @@
package net.frozenorb.apiv3.route.grants;
package net.frozenorb.apiv3.web.route.grants;
import com.google.common.collect.ImmutableMap;
import net.frozenorb.apiv3.APIv3;
import net.frozenorb.apiv3.auditLog.AuditLog;
import net.frozenorb.apiv3.auditLog.AuditLogActionType;
import net.frozenorb.apiv3.model.Grant;
import net.frozenorb.apiv3.model.User;
import net.frozenorb.apiv3.service.auditlog.AuditLog;
import net.frozenorb.apiv3.service.auditlog.AuditLogActionType;
import net.frozenorb.apiv3.domain.Grant;
import net.frozenorb.apiv3.domain.User;
import net.frozenorb.apiv3.unsorted.Permissions;
import net.frozenorb.apiv3.util.ErrorUtils;
import net.frozenorb.apiv3.util.SyncUtils;

4
src/main/java/net/frozenorb/apiv3/route/grants/GETGrants.java → src/main/java/net/frozenorb/apiv3/web/route/grants/GETGrants.java
View File

@ -1,7 +1,7 @@
package net.frozenorb.apiv3.route.grants;
package net.frozenorb.apiv3.web.route.grants;
import net.frozenorb.apiv3.APIv3;
import net.frozenorb.apiv3.model.Grant;
import net.frozenorb.apiv3.domain.Grant;
import net.frozenorb.apiv3.util.ErrorUtils;
import net.frozenorb.apiv3.util.UuidUtils;

4
src/main/java/net/frozenorb/apiv3/route/grants/GETGrantsId.java → src/main/java/net/frozenorb/apiv3/web/route/grants/GETGrantsId.java
View File

@ -1,7 +1,7 @@
package net.frozenorb.apiv3.route.grants;
package net.frozenorb.apiv3.web.route.grants;
import net.frozenorb.apiv3.APIv3;
import net.frozenorb.apiv3.model.Grant;
import net.frozenorb.apiv3.domain.Grant;
import net.frozenorb.apiv3.util.ErrorUtils;
import org.springframework.stereotype.Component;

16
src/main/java/net/frozenorb/apiv3/route/grants/POSTGrants.java → src/main/java/net/frozenorb/apiv3/web/route/grants/POSTGrants.java
View File

@ -1,15 +1,15 @@
package net.frozenorb.apiv3.route.grants;
package net.frozenorb.apiv3.web.route.grants;
import com.google.common.collect.ImmutableMap;
import net.frozenorb.apiv3.APIv3;
import net.frozenorb.apiv3.auditLog.AuditLog;
import net.frozenorb.apiv3.auditLog.AuditLogActionType;
import net.frozenorb.apiv3.model.Grant;
import net.frozenorb.apiv3.model.Rank;
import net.frozenorb.apiv3.model.ServerGroup;
import net.frozenorb.apiv3.model.User;
import net.frozenorb.apiv3.totp.TotpAuthorizationResult;
import net.frozenorb.apiv3.service.auditlog.AuditLog;
import net.frozenorb.apiv3.service.auditlog.AuditLogActionType;
import net.frozenorb.apiv3.domain.Grant;
import net.frozenorb.apiv3.domain.Rank;
import net.frozenorb.apiv3.domain.ServerGroup;
import net.frozenorb.apiv3.domain.User;
import net.frozenorb.apiv3.service.totp.TotpAuthorizationResult;
import net.frozenorb.apiv3.unsorted.Permissions;
import net.frozenorb.apiv3.util.ErrorUtils;
import net.frozenorb.apiv3.util.SyncUtils;

10
src/main/java/net/frozenorb/apiv3/route/ipBans/DELETEIpBansId.java → src/main/java/net/frozenorb/apiv3/web/route/ipBans/DELETEIpBansId.java
View File

@ -1,12 +1,12 @@
package net.frozenorb.apiv3.route.ipBans;
package net.frozenorb.apiv3.web.route.ipBans;
import com.google.common.collect.ImmutableMap;
import net.frozenorb.apiv3.APIv3;
import net.frozenorb.apiv3.auditLog.AuditLog;
import net.frozenorb.apiv3.auditLog.AuditLogActionType;
import net.frozenorb.apiv3.model.IpBan;
import net.frozenorb.apiv3.model.User;
import net.frozenorb.apiv3.service.auditlog.AuditLog;
import net.frozenorb.apiv3.service.auditlog.AuditLogActionType;
import net.frozenorb.apiv3.domain.IpBan;
import net.frozenorb.apiv3.domain.User;
import net.frozenorb.apiv3.util.ErrorUtils;
import net.frozenorb.apiv3.util.SyncUtils;

4
src/main/java/net/frozenorb/apiv3/route/ipBans/GETIpBans.java → src/main/java/net/frozenorb/apiv3/web/route/ipBans/GETIpBans.java
View File

@ -1,7 +1,7 @@
package net.frozenorb.apiv3.route.ipBans;
package net.frozenorb.apiv3.web.route.ipBans;
import net.frozenorb.apiv3.APIv3;
import net.frozenorb.apiv3.model.IpBan;
import net.frozenorb.apiv3.domain.IpBan;
import net.frozenorb.apiv3.util.ErrorUtils;
import net.frozenorb.apiv3.util.IpUtils;

Some files were not shown because too many files have changed in this diff Show More