diff --git a/src/main/java/net/frozenorb/apiv3/APIv3.java b/src/main/java/net/frozenorb/apiv3/APIv3.java index 262a4fa..612090f 100644 --- a/src/main/java/net/frozenorb/apiv3/APIv3.java +++ b/src/main/java/net/frozenorb/apiv3/APIv3.java @@ -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)); } } diff --git a/src/main/java/net/frozenorb/apiv3/ApiVerticle.java b/src/main/java/net/frozenorb/apiv3/ApiVerticle.java new file mode 100644 index 0000000..5d2278e --- /dev/null +++ b/src/main/java/net/frozenorb/apiv3/ApiVerticle.java @@ -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); + } + +} \ No newline at end of file diff --git a/src/main/java/net/frozenorb/apiv3/Main.java b/src/main/java/net/frozenorb/apiv3/Main.java index f966c5c..2755750 100644 --- a/src/main/java/net/frozenorb/apiv3/Main.java +++ b/src/main/java/net/frozenorb/apiv3/Main.java @@ -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); } } \ No newline at end of file diff --git a/src/main/java/net/frozenorb/apiv3/config/GsonConfig.java b/src/main/java/net/frozenorb/apiv3/config/GsonConfig.java new file mode 100644 index 0000000..8da59ae --- /dev/null +++ b/src/main/java/net/frozenorb/apiv3/config/GsonConfig.java @@ -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(); + } + +} \ No newline at end of file diff --git a/src/main/java/net/frozenorb/apiv3/config/VertxConfig.java b/src/main/java/net/frozenorb/apiv3/config/VertxConfig.java new file mode 100644 index 0000000..3a259f3 --- /dev/null +++ b/src/main/java/net/frozenorb/apiv3/config/VertxConfig.java @@ -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; + } + +} \ No newline at end of file diff --git a/src/main/java/net/frozenorb/apiv3/model/AccessToken.java b/src/main/java/net/frozenorb/apiv3/domain/AccessToken.java similarity index 96% rename from src/main/java/net/frozenorb/apiv3/model/AccessToken.java rename to src/main/java/net/frozenorb/apiv3/domain/AccessToken.java index f8e4105..e0d0623 100644 --- a/src/main/java/net/frozenorb/apiv3/model/AccessToken.java +++ b/src/main/java/net/frozenorb/apiv3/domain/AccessToken.java @@ -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; diff --git a/src/main/java/net/frozenorb/apiv3/model/AuditLogEntry.java b/src/main/java/net/frozenorb/apiv3/domain/AuditLogEntry.java similarity index 92% rename from src/main/java/net/frozenorb/apiv3/model/AuditLogEntry.java rename to src/main/java/net/frozenorb/apiv3/domain/AuditLogEntry.java index b93635f..649634e 100644 --- a/src/main/java/net/frozenorb/apiv3/model/AuditLogEntry.java +++ b/src/main/java/net/frozenorb/apiv3/domain/AuditLogEntry.java @@ -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; diff --git a/src/main/java/net/frozenorb/apiv3/model/BannedAsn.java b/src/main/java/net/frozenorb/apiv3/domain/BannedAsn.java similarity index 98% rename from src/main/java/net/frozenorb/apiv3/model/BannedAsn.java rename to src/main/java/net/frozenorb/apiv3/domain/BannedAsn.java index 70a4640..645328f 100644 --- a/src/main/java/net/frozenorb/apiv3/model/BannedAsn.java +++ b/src/main/java/net/frozenorb/apiv3/domain/BannedAsn.java @@ -1,4 +1,4 @@ -package net.frozenorb.apiv3.model; +package net.frozenorb.apiv3.domain; import com.google.common.collect.ImmutableList; diff --git a/src/main/java/net/frozenorb/apiv3/model/BannedCellCarrier.java b/src/main/java/net/frozenorb/apiv3/domain/BannedCellCarrier.java similarity index 98% rename from src/main/java/net/frozenorb/apiv3/model/BannedCellCarrier.java rename to src/main/java/net/frozenorb/apiv3/domain/BannedCellCarrier.java index 0620d20..d2b649b 100644 --- a/src/main/java/net/frozenorb/apiv3/model/BannedCellCarrier.java +++ b/src/main/java/net/frozenorb/apiv3/domain/BannedCellCarrier.java @@ -1,5 +1,5 @@ -package net.frozenorb.apiv3.model; +package net.frozenorb.apiv3.domain; import com.google.common.collect.ImmutableList; diff --git a/src/main/java/net/frozenorb/apiv3/model/ChatFilterEntry.java b/src/main/java/net/frozenorb/apiv3/domain/ChatFilterEntry.java similarity index 97% rename from src/main/java/net/frozenorb/apiv3/model/ChatFilterEntry.java rename to src/main/java/net/frozenorb/apiv3/domain/ChatFilterEntry.java index 788db7c..04727ac 100644 --- a/src/main/java/net/frozenorb/apiv3/model/ChatFilterEntry.java +++ b/src/main/java/net/frozenorb/apiv3/domain/ChatFilterEntry.java @@ -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; diff --git a/src/main/java/net/frozenorb/apiv3/model/Grant.java b/src/main/java/net/frozenorb/apiv3/domain/Grant.java similarity index 99% rename from src/main/java/net/frozenorb/apiv3/model/Grant.java rename to src/main/java/net/frozenorb/apiv3/domain/Grant.java index 5d77f49..a1151a1 100644 --- a/src/main/java/net/frozenorb/apiv3/model/Grant.java +++ b/src/main/java/net/frozenorb/apiv3/domain/Grant.java @@ -1,4 +1,4 @@ -package net.frozenorb.apiv3.model; +package net.frozenorb.apiv3.domain; import com.google.common.collect.Collections2; diff --git a/src/main/java/net/frozenorb/apiv3/model/IpBan.java b/src/main/java/net/frozenorb/apiv3/domain/IpBan.java similarity index 97% rename from src/main/java/net/frozenorb/apiv3/model/IpBan.java rename to src/main/java/net/frozenorb/apiv3/domain/IpBan.java index d8cbec2..30f766e 100644 --- a/src/main/java/net/frozenorb/apiv3/model/IpBan.java +++ b/src/main/java/net/frozenorb/apiv3/domain/IpBan.java @@ -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; diff --git a/src/main/java/net/frozenorb/apiv3/model/IpIntel.java b/src/main/java/net/frozenorb/apiv3/domain/IpIntel.java similarity index 96% rename from src/main/java/net/frozenorb/apiv3/model/IpIntel.java rename to src/main/java/net/frozenorb/apiv3/domain/IpIntel.java index 05f3fe3..e36b1cd 100644 --- a/src/main/java/net/frozenorb/apiv3/model/IpIntel.java +++ b/src/main/java/net/frozenorb/apiv3/domain/IpIntel.java @@ -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; diff --git a/src/main/java/net/frozenorb/apiv3/model/IpLogEntry.java b/src/main/java/net/frozenorb/apiv3/domain/IpLogEntry.java similarity index 97% rename from src/main/java/net/frozenorb/apiv3/model/IpLogEntry.java rename to src/main/java/net/frozenorb/apiv3/domain/IpLogEntry.java index 90b5e32..0a81818 100644 --- a/src/main/java/net/frozenorb/apiv3/model/IpLogEntry.java +++ b/src/main/java/net/frozenorb/apiv3/domain/IpLogEntry.java @@ -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; diff --git a/src/main/java/net/frozenorb/apiv3/model/NotificationTemplate.java b/src/main/java/net/frozenorb/apiv3/domain/NotificationTemplate.java similarity index 98% rename from src/main/java/net/frozenorb/apiv3/model/NotificationTemplate.java rename to src/main/java/net/frozenorb/apiv3/domain/NotificationTemplate.java index 21be10e..1f748ee 100644 --- a/src/main/java/net/frozenorb/apiv3/model/NotificationTemplate.java +++ b/src/main/java/net/frozenorb/apiv3/domain/NotificationTemplate.java @@ -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; diff --git a/src/main/java/net/frozenorb/apiv3/model/PhoneIntel.java b/src/main/java/net/frozenorb/apiv3/domain/PhoneIntel.java similarity index 94% rename from src/main/java/net/frozenorb/apiv3/model/PhoneIntel.java rename to src/main/java/net/frozenorb/apiv3/domain/PhoneIntel.java index c25fd70..aaa9497 100644 --- a/src/main/java/net/frozenorb/apiv3/model/PhoneIntel.java +++ b/src/main/java/net/frozenorb/apiv3/domain/PhoneIntel.java @@ -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; diff --git a/src/main/java/net/frozenorb/apiv3/model/Punishment.java b/src/main/java/net/frozenorb/apiv3/domain/Punishment.java similarity index 98% rename from src/main/java/net/frozenorb/apiv3/model/Punishment.java rename to src/main/java/net/frozenorb/apiv3/domain/Punishment.java index 86c5da8..11fc4c9 100644 --- a/src/main/java/net/frozenorb/apiv3/model/Punishment.java +++ b/src/main/java/net/frozenorb/apiv3/domain/Punishment.java @@ -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; diff --git a/src/main/java/net/frozenorb/apiv3/model/Rank.java b/src/main/java/net/frozenorb/apiv3/domain/Rank.java similarity index 98% rename from src/main/java/net/frozenorb/apiv3/model/Rank.java rename to src/main/java/net/frozenorb/apiv3/domain/Rank.java index 71c3ce7..dde9408 100644 --- a/src/main/java/net/frozenorb/apiv3/model/Rank.java +++ b/src/main/java/net/frozenorb/apiv3/domain/Rank.java @@ -1,4 +1,4 @@ -package net.frozenorb.apiv3.model; +package net.frozenorb.apiv3.domain; import com.google.common.collect.ImmutableList; diff --git a/src/main/java/net/frozenorb/apiv3/model/Server.java b/src/main/java/net/frozenorb/apiv3/domain/Server.java similarity index 99% rename from src/main/java/net/frozenorb/apiv3/model/Server.java rename to src/main/java/net/frozenorb/apiv3/domain/Server.java index cce5007..951ddf9 100644 --- a/src/main/java/net/frozenorb/apiv3/model/Server.java +++ b/src/main/java/net/frozenorb/apiv3/domain/Server.java @@ -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; diff --git a/src/main/java/net/frozenorb/apiv3/model/ServerGroup.java b/src/main/java/net/frozenorb/apiv3/domain/ServerGroup.java similarity index 98% rename from src/main/java/net/frozenorb/apiv3/model/ServerGroup.java rename to src/main/java/net/frozenorb/apiv3/domain/ServerGroup.java index 3142ad9..a25ba4f 100644 --- a/src/main/java/net/frozenorb/apiv3/model/ServerGroup.java +++ b/src/main/java/net/frozenorb/apiv3/domain/ServerGroup.java @@ -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; diff --git a/src/main/java/net/frozenorb/apiv3/model/User.java b/src/main/java/net/frozenorb/apiv3/domain/User.java similarity index 97% rename from src/main/java/net/frozenorb/apiv3/model/User.java rename to src/main/java/net/frozenorb/apiv3/domain/User.java index 8a453bc..201e07d 100644 --- a/src/main/java/net/frozenorb/apiv3/model/User.java +++ b/src/main/java/net/frozenorb/apiv3/domain/User.java @@ -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")); diff --git a/src/main/java/net/frozenorb/apiv3/auditLog/AuditLog.java b/src/main/java/net/frozenorb/apiv3/service/auditlog/AuditLog.java similarity index 91% rename from src/main/java/net/frozenorb/apiv3/auditLog/AuditLog.java rename to src/main/java/net/frozenorb/apiv3/service/auditlog/AuditLog.java index 41b59dd..5330be7 100644 --- a/src/main/java/net/frozenorb/apiv3/auditLog/AuditLog.java +++ b/src/main/java/net/frozenorb/apiv3/service/auditlog/AuditLog.java @@ -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; diff --git a/src/main/java/net/frozenorb/apiv3/auditLog/AuditLogActionType.java b/src/main/java/net/frozenorb/apiv3/service/auditlog/AuditLogActionType.java similarity index 94% rename from src/main/java/net/frozenorb/apiv3/auditLog/AuditLogActionType.java rename to src/main/java/net/frozenorb/apiv3/service/auditlog/AuditLogActionType.java index bab4010..e88672c 100644 --- a/src/main/java/net/frozenorb/apiv3/auditLog/AuditLogActionType.java +++ b/src/main/java/net/frozenorb/apiv3/service/auditlog/AuditLogActionType.java @@ -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; diff --git a/src/main/java/net/frozenorb/apiv3/disposablelogintoken/DisposableLoginTokenService.java b/src/main/java/net/frozenorb/apiv3/service/disposablelogintoken/DisposableLoginTokenService.java similarity index 78% rename from src/main/java/net/frozenorb/apiv3/disposablelogintoken/DisposableLoginTokenService.java rename to src/main/java/net/frozenorb/apiv3/service/disposablelogintoken/DisposableLoginTokenService.java index 6cb3c34..c111b30 100644 --- a/src/main/java/net/frozenorb/apiv3/disposablelogintoken/DisposableLoginTokenService.java +++ b/src/main/java/net/frozenorb/apiv3/service/disposablelogintoken/DisposableLoginTokenService.java @@ -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; diff --git a/src/main/java/net/frozenorb/apiv3/disposablelogintoken/RedisDisposableLoginTokenService.java b/src/main/java/net/frozenorb/apiv3/service/disposablelogintoken/RedisDisposableLoginTokenService.java similarity index 95% rename from src/main/java/net/frozenorb/apiv3/disposablelogintoken/RedisDisposableLoginTokenService.java rename to src/main/java/net/frozenorb/apiv3/service/disposablelogintoken/RedisDisposableLoginTokenService.java index 4338e3c..b64123e 100644 --- a/src/main/java/net/frozenorb/apiv3/disposablelogintoken/RedisDisposableLoginTokenService.java +++ b/src/main/java/net/frozenorb/apiv3/service/disposablelogintoken/RedisDisposableLoginTokenService.java @@ -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; diff --git a/src/main/java/net/frozenorb/apiv3/email/EmailService.java b/src/main/java/net/frozenorb/apiv3/service/email/EmailService.java similarity index 86% rename from src/main/java/net/frozenorb/apiv3/email/EmailService.java rename to src/main/java/net/frozenorb/apiv3/service/email/EmailService.java index 8626220..a95f1f7 100644 --- a/src/main/java/net/frozenorb/apiv3/email/EmailService.java +++ b/src/main/java/net/frozenorb/apiv3/service/email/EmailService.java @@ -1,4 +1,4 @@ -package net.frozenorb.apiv3.email; +package net.frozenorb.apiv3.service.email; import com.mongodb.async.SingleResultCallback; diff --git a/src/main/java/net/frozenorb/apiv3/email/MandrillEmailService.java b/src/main/java/net/frozenorb/apiv3/service/email/MandrillEmailService.java similarity index 98% rename from src/main/java/net/frozenorb/apiv3/email/MandrillEmailService.java rename to src/main/java/net/frozenorb/apiv3/service/email/MandrillEmailService.java index 8067b27..36968ec 100644 --- a/src/main/java/net/frozenorb/apiv3/email/MandrillEmailService.java +++ b/src/main/java/net/frozenorb/apiv3/service/email/MandrillEmailService.java @@ -1,4 +1,4 @@ -package net.frozenorb.apiv3.email; +package net.frozenorb.apiv3.service.email; import com.google.common.net.MediaType; diff --git a/src/main/java/net/frozenorb/apiv3/email/EmailDomainService.java b/src/main/java/net/frozenorb/apiv3/service/emaildomain/EmailDomainService.java similarity index 73% rename from src/main/java/net/frozenorb/apiv3/email/EmailDomainService.java rename to src/main/java/net/frozenorb/apiv3/service/emaildomain/EmailDomainService.java index e4e8604..47dc07c 100644 --- a/src/main/java/net/frozenorb/apiv3/email/EmailDomainService.java +++ b/src/main/java/net/frozenorb/apiv3/service/emaildomain/EmailDomainService.java @@ -1,4 +1,4 @@ -package net.frozenorb.apiv3.email; +package net.frozenorb.apiv3.service.emaildomain; import org.springframework.stereotype.Service; diff --git a/src/main/java/net/frozenorb/apiv3/email/GitHubEmailDomainService.java b/src/main/java/net/frozenorb/apiv3/service/emaildomain/GitHubEmailDomainService.java similarity index 96% rename from src/main/java/net/frozenorb/apiv3/email/GitHubEmailDomainService.java rename to src/main/java/net/frozenorb/apiv3/service/emaildomain/GitHubEmailDomainService.java index e0e4919..2b7baf8 100644 --- a/src/main/java/net/frozenorb/apiv3/email/GitHubEmailDomainService.java +++ b/src/main/java/net/frozenorb/apiv3/service/emaildomain/GitHubEmailDomainService.java @@ -1,4 +1,4 @@ -package net.frozenorb.apiv3.email; +package net.frozenorb.apiv3.service.emaildomain; import com.google.common.collect.ImmutableSet; diff --git a/src/main/java/net/frozenorb/apiv3/geoip/GeoIpCity.java b/src/main/java/net/frozenorb/apiv3/service/geoip/GeoIpCity.java similarity index 91% rename from src/main/java/net/frozenorb/apiv3/geoip/GeoIpCity.java rename to src/main/java/net/frozenorb/apiv3/service/geoip/GeoIpCity.java index f34aff8..ab86e19 100644 --- a/src/main/java/net/frozenorb/apiv3/geoip/GeoIpCity.java +++ b/src/main/java/net/frozenorb/apiv3/service/geoip/GeoIpCity.java @@ -1,4 +1,4 @@ -package net.frozenorb.apiv3.geoip; +package net.frozenorb.apiv3.service.geoip; import io.vertx.core.json.JsonObject; import lombok.Getter; diff --git a/src/main/java/net/frozenorb/apiv3/geoip/GeoIpContinent.java b/src/main/java/net/frozenorb/apiv3/service/geoip/GeoIpContinent.java similarity index 91% rename from src/main/java/net/frozenorb/apiv3/geoip/GeoIpContinent.java rename to src/main/java/net/frozenorb/apiv3/service/geoip/GeoIpContinent.java index 5fecde0..45b16e0 100644 --- a/src/main/java/net/frozenorb/apiv3/geoip/GeoIpContinent.java +++ b/src/main/java/net/frozenorb/apiv3/service/geoip/GeoIpContinent.java @@ -1,4 +1,4 @@ -package net.frozenorb.apiv3.geoip; +package net.frozenorb.apiv3.service.geoip; import io.vertx.core.json.JsonObject; import lombok.Getter; diff --git a/src/main/java/net/frozenorb/apiv3/geoip/GeoIpCountry.java b/src/main/java/net/frozenorb/apiv3/service/geoip/GeoIpCountry.java similarity index 92% rename from src/main/java/net/frozenorb/apiv3/geoip/GeoIpCountry.java rename to src/main/java/net/frozenorb/apiv3/service/geoip/GeoIpCountry.java index c51c6fe..2d15cd5 100644 --- a/src/main/java/net/frozenorb/apiv3/geoip/GeoIpCountry.java +++ b/src/main/java/net/frozenorb/apiv3/service/geoip/GeoIpCountry.java @@ -1,4 +1,4 @@ -package net.frozenorb.apiv3.geoip; +package net.frozenorb.apiv3.service.geoip; import io.vertx.core.json.JsonObject; import lombok.Getter; diff --git a/src/main/java/net/frozenorb/apiv3/geoip/GeoIpInfo.java b/src/main/java/net/frozenorb/apiv3/service/geoip/GeoIpInfo.java similarity index 97% rename from src/main/java/net/frozenorb/apiv3/geoip/GeoIpInfo.java rename to src/main/java/net/frozenorb/apiv3/service/geoip/GeoIpInfo.java index fe11ef1..cdbce8a 100644 --- a/src/main/java/net/frozenorb/apiv3/geoip/GeoIpInfo.java +++ b/src/main/java/net/frozenorb/apiv3/service/geoip/GeoIpInfo.java @@ -1,4 +1,4 @@ -package net.frozenorb.apiv3.geoip; +package net.frozenorb.apiv3.service.geoip; import com.google.common.collect.ImmutableList; diff --git a/src/main/java/net/frozenorb/apiv3/geoip/GeoIpLocation.java b/src/main/java/net/frozenorb/apiv3/service/geoip/GeoIpLocation.java similarity index 95% rename from src/main/java/net/frozenorb/apiv3/geoip/GeoIpLocation.java rename to src/main/java/net/frozenorb/apiv3/service/geoip/GeoIpLocation.java index dbc395a..c46028d 100644 --- a/src/main/java/net/frozenorb/apiv3/geoip/GeoIpLocation.java +++ b/src/main/java/net/frozenorb/apiv3/service/geoip/GeoIpLocation.java @@ -1,4 +1,4 @@ -package net.frozenorb.apiv3.geoip; +package net.frozenorb.apiv3.service.geoip; import io.vertx.core.json.JsonObject; import lombok.Getter; diff --git a/src/main/java/net/frozenorb/apiv3/geoip/GeoIpPostal.java b/src/main/java/net/frozenorb/apiv3/service/geoip/GeoIpPostal.java similarity index 88% rename from src/main/java/net/frozenorb/apiv3/geoip/GeoIpPostal.java rename to src/main/java/net/frozenorb/apiv3/service/geoip/GeoIpPostal.java index a358745..06167e0 100644 --- a/src/main/java/net/frozenorb/apiv3/geoip/GeoIpPostal.java +++ b/src/main/java/net/frozenorb/apiv3/service/geoip/GeoIpPostal.java @@ -1,4 +1,4 @@ -package net.frozenorb.apiv3.geoip; +package net.frozenorb.apiv3.service.geoip; import io.vertx.core.json.JsonObject; import lombok.Getter; diff --git a/src/main/java/net/frozenorb/apiv3/geoip/GeoIpRegisteredCountry.java b/src/main/java/net/frozenorb/apiv3/service/geoip/GeoIpRegisteredCountry.java similarity index 92% rename from src/main/java/net/frozenorb/apiv3/geoip/GeoIpRegisteredCountry.java rename to src/main/java/net/frozenorb/apiv3/service/geoip/GeoIpRegisteredCountry.java index 7d701d0..1ef7aed 100644 --- a/src/main/java/net/frozenorb/apiv3/geoip/GeoIpRegisteredCountry.java +++ b/src/main/java/net/frozenorb/apiv3/service/geoip/GeoIpRegisteredCountry.java @@ -1,4 +1,4 @@ -package net.frozenorb.apiv3.geoip; +package net.frozenorb.apiv3.service.geoip; import io.vertx.core.json.JsonObject; import lombok.Getter; diff --git a/src/main/java/net/frozenorb/apiv3/geoip/GeoIpService.java b/src/main/java/net/frozenorb/apiv3/service/geoip/GeoIpService.java similarity index 82% rename from src/main/java/net/frozenorb/apiv3/geoip/GeoIpService.java rename to src/main/java/net/frozenorb/apiv3/service/geoip/GeoIpService.java index 6aecc02..70db903 100644 --- a/src/main/java/net/frozenorb/apiv3/geoip/GeoIpService.java +++ b/src/main/java/net/frozenorb/apiv3/service/geoip/GeoIpService.java @@ -1,4 +1,4 @@ -package net.frozenorb.apiv3.geoip; +package net.frozenorb.apiv3.service.geoip; import com.mongodb.async.SingleResultCallback; diff --git a/src/main/java/net/frozenorb/apiv3/geoip/GeoIpSubdivision.java b/src/main/java/net/frozenorb/apiv3/service/geoip/GeoIpSubdivision.java similarity index 93% rename from src/main/java/net/frozenorb/apiv3/geoip/GeoIpSubdivision.java rename to src/main/java/net/frozenorb/apiv3/service/geoip/GeoIpSubdivision.java index f5c0c58..cb98484 100644 --- a/src/main/java/net/frozenorb/apiv3/geoip/GeoIpSubdivision.java +++ b/src/main/java/net/frozenorb/apiv3/service/geoip/GeoIpSubdivision.java @@ -1,4 +1,4 @@ -package net.frozenorb.apiv3.geoip; +package net.frozenorb.apiv3.service.geoip; import io.vertx.core.json.JsonObject; import lombok.Getter; diff --git a/src/main/java/net/frozenorb/apiv3/geoip/GeoIpTraits.java b/src/main/java/net/frozenorb/apiv3/service/geoip/GeoIpTraits.java similarity index 94% rename from src/main/java/net/frozenorb/apiv3/geoip/GeoIpTraits.java rename to src/main/java/net/frozenorb/apiv3/service/geoip/GeoIpTraits.java index f01205a..8a631f0 100644 --- a/src/main/java/net/frozenorb/apiv3/geoip/GeoIpTraits.java +++ b/src/main/java/net/frozenorb/apiv3/service/geoip/GeoIpTraits.java @@ -1,4 +1,4 @@ -package net.frozenorb.apiv3.geoip; +package net.frozenorb.apiv3.service.geoip; import io.vertx.core.json.JsonObject; import lombok.Getter; diff --git a/src/main/java/net/frozenorb/apiv3/geoip/GeoIpUserType.java b/src/main/java/net/frozenorb/apiv3/service/geoip/GeoIpUserType.java similarity index 91% rename from src/main/java/net/frozenorb/apiv3/geoip/GeoIpUserType.java rename to src/main/java/net/frozenorb/apiv3/service/geoip/GeoIpUserType.java index 53afe06..212b4e9 100644 --- a/src/main/java/net/frozenorb/apiv3/geoip/GeoIpUserType.java +++ b/src/main/java/net/frozenorb/apiv3/service/geoip/GeoIpUserType.java @@ -1,4 +1,4 @@ -package net.frozenorb.apiv3.geoip; +package net.frozenorb.apiv3.service.geoip; import lombok.Getter; diff --git a/src/main/java/net/frozenorb/apiv3/geoip/MaxMindGeoIpService.java b/src/main/java/net/frozenorb/apiv3/service/geoip/MaxMindGeoIpService.java similarity index 98% rename from src/main/java/net/frozenorb/apiv3/geoip/MaxMindGeoIpService.java rename to src/main/java/net/frozenorb/apiv3/service/geoip/MaxMindGeoIpService.java index 10c88ff..0bca065 100644 --- a/src/main/java/net/frozenorb/apiv3/geoip/MaxMindGeoIpService.java +++ b/src/main/java/net/frozenorb/apiv3/service/geoip/MaxMindGeoIpService.java @@ -1,4 +1,4 @@ -package net.frozenorb.apiv3.geoip; +package net.frozenorb.apiv3.service.geoip; import com.google.common.base.Charsets; diff --git a/src/main/java/net/frozenorb/apiv3/mojang/HttpMojangService.java b/src/main/java/net/frozenorb/apiv3/service/mojang/HttpMojangService.java similarity index 96% rename from src/main/java/net/frozenorb/apiv3/mojang/HttpMojangService.java rename to src/main/java/net/frozenorb/apiv3/service/mojang/HttpMojangService.java index 877dc6d..86741fb 100644 --- a/src/main/java/net/frozenorb/apiv3/mojang/HttpMojangService.java +++ b/src/main/java/net/frozenorb/apiv3/service/mojang/HttpMojangService.java @@ -1,4 +1,4 @@ -package net.frozenorb.apiv3.mojang; +package net.frozenorb.apiv3.service.mojang; import com.mongodb.async.SingleResultCallback; diff --git a/src/main/java/net/frozenorb/apiv3/mojang/MojangService.java b/src/main/java/net/frozenorb/apiv3/service/mojang/MojangService.java similarity index 83% rename from src/main/java/net/frozenorb/apiv3/mojang/MojangService.java rename to src/main/java/net/frozenorb/apiv3/service/mojang/MojangService.java index 219e4a2..32c55a0 100644 --- a/src/main/java/net/frozenorb/apiv3/mojang/MojangService.java +++ b/src/main/java/net/frozenorb/apiv3/service/mojang/MojangService.java @@ -1,4 +1,4 @@ -package net.frozenorb.apiv3.mojang; +package net.frozenorb.apiv3.service.mojang; import com.mongodb.async.SingleResultCallback; diff --git a/src/main/java/net/frozenorb/apiv3/sms/SmsCarrierInfo.java b/src/main/java/net/frozenorb/apiv3/service/sms/SmsCarrierInfo.java similarity index 93% rename from src/main/java/net/frozenorb/apiv3/sms/SmsCarrierInfo.java rename to src/main/java/net/frozenorb/apiv3/service/sms/SmsCarrierInfo.java index 045788d..9aae582 100644 --- a/src/main/java/net/frozenorb/apiv3/sms/SmsCarrierInfo.java +++ b/src/main/java/net/frozenorb/apiv3/service/sms/SmsCarrierInfo.java @@ -1,4 +1,4 @@ -package net.frozenorb.apiv3.sms; +package net.frozenorb.apiv3.service.sms; import io.vertx.core.json.JsonObject; import lombok.Getter; diff --git a/src/main/java/net/frozenorb/apiv3/sms/SmsService.java b/src/main/java/net/frozenorb/apiv3/service/sms/SmsService.java similarity index 90% rename from src/main/java/net/frozenorb/apiv3/sms/SmsService.java rename to src/main/java/net/frozenorb/apiv3/service/sms/SmsService.java index ef64832..a42a782 100644 --- a/src/main/java/net/frozenorb/apiv3/sms/SmsService.java +++ b/src/main/java/net/frozenorb/apiv3/service/sms/SmsService.java @@ -1,4 +1,4 @@ -package net.frozenorb.apiv3.sms; +package net.frozenorb.apiv3.service.sms; import com.mongodb.async.SingleResultCallback; diff --git a/src/main/java/net/frozenorb/apiv3/sms/ZangSmsService.java b/src/main/java/net/frozenorb/apiv3/service/sms/ZangSmsService.java similarity index 98% rename from src/main/java/net/frozenorb/apiv3/sms/ZangSmsService.java rename to src/main/java/net/frozenorb/apiv3/service/sms/ZangSmsService.java index a16f332..9f607c1 100644 --- a/src/main/java/net/frozenorb/apiv3/sms/ZangSmsService.java +++ b/src/main/java/net/frozenorb/apiv3/service/sms/ZangSmsService.java @@ -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; diff --git a/src/main/java/net/frozenorb/apiv3/totp/RedisTotpService.java b/src/main/java/net/frozenorb/apiv3/service/totp/RedisTotpService.java similarity index 97% rename from src/main/java/net/frozenorb/apiv3/totp/RedisTotpService.java rename to src/main/java/net/frozenorb/apiv3/service/totp/RedisTotpService.java index 8f9b539..8abd9c7 100644 --- a/src/main/java/net/frozenorb/apiv3/totp/RedisTotpService.java +++ b/src/main/java/net/frozenorb/apiv3/service/totp/RedisTotpService.java @@ -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; diff --git a/src/main/java/net/frozenorb/apiv3/totp/RequiresTotpResult.java b/src/main/java/net/frozenorb/apiv3/service/totp/RequiresTotpResult.java similarity index 72% rename from src/main/java/net/frozenorb/apiv3/totp/RequiresTotpResult.java rename to src/main/java/net/frozenorb/apiv3/service/totp/RequiresTotpResult.java index 1227b09..009c4f9 100644 --- a/src/main/java/net/frozenorb/apiv3/totp/RequiresTotpResult.java +++ b/src/main/java/net/frozenorb/apiv3/service/totp/RequiresTotpResult.java @@ -1,4 +1,4 @@ -package net.frozenorb.apiv3.totp; +package net.frozenorb.apiv3.service.totp; public enum RequiresTotpResult { diff --git a/src/main/java/net/frozenorb/apiv3/totp/TotpAuthorizationResult.java b/src/main/java/net/frozenorb/apiv3/service/totp/TotpAuthorizationResult.java similarity index 89% rename from src/main/java/net/frozenorb/apiv3/totp/TotpAuthorizationResult.java rename to src/main/java/net/frozenorb/apiv3/service/totp/TotpAuthorizationResult.java index c703104..67f43b3 100644 --- a/src/main/java/net/frozenorb/apiv3/totp/TotpAuthorizationResult.java +++ b/src/main/java/net/frozenorb/apiv3/service/totp/TotpAuthorizationResult.java @@ -1,4 +1,4 @@ -package net.frozenorb.apiv3.totp; +package net.frozenorb.apiv3.service.totp; import lombok.Getter; diff --git a/src/main/java/net/frozenorb/apiv3/totp/TotpService.java b/src/main/java/net/frozenorb/apiv3/service/totp/TotpService.java similarity index 86% rename from src/main/java/net/frozenorb/apiv3/totp/TotpService.java rename to src/main/java/net/frozenorb/apiv3/service/totp/TotpService.java index 4715c9f..3e0ac1d 100644 --- a/src/main/java/net/frozenorb/apiv3/totp/TotpService.java +++ b/src/main/java/net/frozenorb/apiv3/service/totp/TotpService.java @@ -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; diff --git a/src/main/java/net/frozenorb/apiv3/usersession/RedisUserSessionService.java b/src/main/java/net/frozenorb/apiv3/service/usersession/RedisUserSessionService.java similarity index 98% rename from src/main/java/net/frozenorb/apiv3/usersession/RedisUserSessionService.java rename to src/main/java/net/frozenorb/apiv3/service/usersession/RedisUserSessionService.java index 7640ef4..01b32a0 100644 --- a/src/main/java/net/frozenorb/apiv3/usersession/RedisUserSessionService.java +++ b/src/main/java/net/frozenorb/apiv3/service/usersession/RedisUserSessionService.java @@ -1,4 +1,4 @@ -package net.frozenorb.apiv3.usersession; +package net.frozenorb.apiv3.service.usersession; import com.mongodb.async.SingleResultCallback; diff --git a/src/main/java/net/frozenorb/apiv3/usersession/UserSessionService.java b/src/main/java/net/frozenorb/apiv3/service/usersession/UserSessionService.java similarity index 91% rename from src/main/java/net/frozenorb/apiv3/usersession/UserSessionService.java rename to src/main/java/net/frozenorb/apiv3/service/usersession/UserSessionService.java index 3af3b02..bbba80e 100644 --- a/src/main/java/net/frozenorb/apiv3/usersession/UserSessionService.java +++ b/src/main/java/net/frozenorb/apiv3/service/usersession/UserSessionService.java @@ -1,4 +1,4 @@ -package net.frozenorb.apiv3.usersession; +package net.frozenorb.apiv3.service.usersession; import com.mongodb.async.SingleResultCallback; diff --git a/src/main/java/net/frozenorb/apiv3/unsorted/Notification.java b/src/main/java/net/frozenorb/apiv3/unsorted/Notification.java index 01d1d28..b7d483a 100644 --- a/src/main/java/net/frozenorb/apiv3/unsorted/Notification.java +++ b/src/main/java/net/frozenorb/apiv3/unsorted/Notification.java @@ -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; diff --git a/src/main/java/net/frozenorb/apiv3/actor/Actor.java b/src/main/java/net/frozenorb/apiv3/unsorted/actor/Actor.java similarity index 68% rename from src/main/java/net/frozenorb/apiv3/actor/Actor.java rename to src/main/java/net/frozenorb/apiv3/unsorted/actor/Actor.java index 6fdaac7..0d43b39 100644 --- a/src/main/java/net/frozenorb/apiv3/actor/Actor.java +++ b/src/main/java/net/frozenorb/apiv3/unsorted/actor/Actor.java @@ -1,4 +1,4 @@ -package net.frozenorb.apiv3.actor; +package net.frozenorb.apiv3.unsorted.actor; public interface Actor { diff --git a/src/main/java/net/frozenorb/apiv3/actor/ActorType.java b/src/main/java/net/frozenorb/apiv3/unsorted/actor/ActorType.java similarity index 64% rename from src/main/java/net/frozenorb/apiv3/actor/ActorType.java rename to src/main/java/net/frozenorb/apiv3/unsorted/actor/ActorType.java index a187e2a..b3d4c1c 100644 --- a/src/main/java/net/frozenorb/apiv3/actor/ActorType.java +++ b/src/main/java/net/frozenorb/apiv3/unsorted/actor/ActorType.java @@ -1,4 +1,4 @@ -package net.frozenorb.apiv3.actor; +package net.frozenorb.apiv3.unsorted.actor; public enum ActorType { diff --git a/src/main/java/net/frozenorb/apiv3/actor/SimpleActor.java b/src/main/java/net/frozenorb/apiv3/unsorted/actor/SimpleActor.java similarity index 83% rename from src/main/java/net/frozenorb/apiv3/actor/SimpleActor.java rename to src/main/java/net/frozenorb/apiv3/unsorted/actor/SimpleActor.java index ae70268..1d74e2c 100644 --- a/src/main/java/net/frozenorb/apiv3/actor/SimpleActor.java +++ b/src/main/java/net/frozenorb/apiv3/unsorted/actor/SimpleActor.java @@ -1,4 +1,4 @@ -package net.frozenorb.apiv3.actor; +package net.frozenorb.apiv3.unsorted.actor; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/net/frozenorb/apiv3/util/GeoJsonPoint.java b/src/main/java/net/frozenorb/apiv3/util/GeoJsonPoint.java index a4106c3..6d19b31 100644 --- a/src/main/java/net/frozenorb/apiv3/util/GeoJsonPoint.java +++ b/src/main/java/net/frozenorb/apiv3/util/GeoJsonPoint.java @@ -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 { diff --git a/src/main/java/net/frozenorb/apiv3/util/PermissionUtils.java b/src/main/java/net/frozenorb/apiv3/util/PermissionUtils.java index e849125..b3a89f2 100644 --- a/src/main/java/net/frozenorb/apiv3/util/PermissionUtils.java +++ b/src/main/java/net/frozenorb/apiv3/util/PermissionUtils.java @@ -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; diff --git a/src/main/java/net/frozenorb/apiv3/util/SpringUtils.java b/src/main/java/net/frozenorb/apiv3/util/SpringUtils.java index 01a0eb4..c95afd8 100644 --- a/src/main/java/net/frozenorb/apiv3/util/SpringUtils.java +++ b/src/main/java/net/frozenorb/apiv3/util/SpringUtils.java @@ -18,8 +18,4 @@ public final class SpringUtils { return beanFactory.getBean(Environment.class).getProperty(key); } - public static T getProperty(String key, Class type) { - return beanFactory.getBean(Environment.class).getProperty(key, type); - } - } \ No newline at end of file diff --git a/src/main/java/net/frozenorb/apiv3/filter/AuthenticationFilter.java b/src/main/java/net/frozenorb/apiv3/web/filter/AuthenticationFilter.java similarity index 90% rename from src/main/java/net/frozenorb/apiv3/filter/AuthenticationFilter.java rename to src/main/java/net/frozenorb/apiv3/web/filter/AuthenticationFilter.java index 42c73b3..5c1ec4d 100644 --- a/src/main/java/net/frozenorb/apiv3/filter/AuthenticationFilter.java +++ b/src/main/java/net/frozenorb/apiv3/web/filter/AuthenticationFilter.java @@ -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; diff --git a/src/main/java/net/frozenorb/apiv3/filter/AuthorizationFilter.java b/src/main/java/net/frozenorb/apiv3/web/filter/AuthorizationFilter.java similarity index 86% rename from src/main/java/net/frozenorb/apiv3/filter/AuthorizationFilter.java rename to src/main/java/net/frozenorb/apiv3/web/filter/AuthorizationFilter.java index ce080bd..afea975 100644 --- a/src/main/java/net/frozenorb/apiv3/filter/AuthorizationFilter.java +++ b/src/main/java/net/frozenorb/apiv3/web/filter/AuthorizationFilter.java @@ -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; diff --git a/src/main/java/net/frozenorb/apiv3/filter/MetricsFilter.java b/src/main/java/net/frozenorb/apiv3/web/filter/MetricsFilter.java similarity index 94% rename from src/main/java/net/frozenorb/apiv3/filter/MetricsFilter.java rename to src/main/java/net/frozenorb/apiv3/web/filter/MetricsFilter.java index 2ed05c7..f1713ee 100644 --- a/src/main/java/net/frozenorb/apiv3/filter/MetricsFilter.java +++ b/src/main/java/net/frozenorb/apiv3/web/filter/MetricsFilter.java @@ -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; diff --git a/src/main/java/net/frozenorb/apiv3/filter/WebsiteUserSessionFilter.java b/src/main/java/net/frozenorb/apiv3/web/filter/WebsiteUserSessionFilter.java similarity index 94% rename from src/main/java/net/frozenorb/apiv3/filter/WebsiteUserSessionFilter.java rename to src/main/java/net/frozenorb/apiv3/web/filter/WebsiteUserSessionFilter.java index 4f53676..6e53931 100644 --- a/src/main/java/net/frozenorb/apiv3/filter/WebsiteUserSessionFilter.java +++ b/src/main/java/net/frozenorb/apiv3/web/filter/WebsiteUserSessionFilter.java @@ -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; diff --git a/src/main/java/net/frozenorb/apiv3/route/GETDumpsType.java b/src/main/java/net/frozenorb/apiv3/web/route/GETDumpsType.java similarity index 93% rename from src/main/java/net/frozenorb/apiv3/route/GETDumpsType.java rename to src/main/java/net/frozenorb/apiv3/web/route/GETDumpsType.java index 51656b2..6baef16 100644 --- a/src/main/java/net/frozenorb/apiv3/route/GETDumpsType.java +++ b/src/main/java/net/frozenorb/apiv3/web/route/GETDumpsType.java @@ -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; diff --git a/src/main/java/net/frozenorb/apiv3/route/GETSearch.java b/src/main/java/net/frozenorb/apiv3/web/route/GETSearch.java similarity index 95% rename from src/main/java/net/frozenorb/apiv3/route/GETSearch.java rename to src/main/java/net/frozenorb/apiv3/web/route/GETSearch.java index 474077c..bfb934d 100644 --- a/src/main/java/net/frozenorb/apiv3/route/GETSearch.java +++ b/src/main/java/net/frozenorb/apiv3/web/route/GETSearch.java @@ -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; diff --git a/src/main/java/net/frozenorb/apiv3/route/GETWhoAmI.java b/src/main/java/net/frozenorb/apiv3/web/route/GETWhoAmI.java similarity index 85% rename from src/main/java/net/frozenorb/apiv3/route/GETWhoAmI.java rename to src/main/java/net/frozenorb/apiv3/web/route/GETWhoAmI.java index 377d749..d97d0b6 100644 --- a/src/main/java/net/frozenorb/apiv3/route/GETWhoAmI.java +++ b/src/main/java/net/frozenorb/apiv3/web/route/GETWhoAmI.java @@ -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; diff --git a/src/main/java/net/frozenorb/apiv3/route/POSTLogout.java b/src/main/java/net/frozenorb/apiv3/web/route/POSTLogout.java similarity index 88% rename from src/main/java/net/frozenorb/apiv3/route/POSTLogout.java rename to src/main/java/net/frozenorb/apiv3/web/route/POSTLogout.java index b48b9df..a02fe52 100644 --- a/src/main/java/net/frozenorb/apiv3/route/POSTLogout.java +++ b/src/main/java/net/frozenorb/apiv3/web/route/POSTLogout.java @@ -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; diff --git a/src/main/java/net/frozenorb/apiv3/route/accessTokens/DELETEAccessTokensId.java b/src/main/java/net/frozenorb/apiv3/web/route/accessTokens/DELETEAccessTokensId.java similarity index 86% rename from src/main/java/net/frozenorb/apiv3/route/accessTokens/DELETEAccessTokensId.java rename to src/main/java/net/frozenorb/apiv3/web/route/accessTokens/DELETEAccessTokensId.java index bd32b35..dc16f5f 100644 --- a/src/main/java/net/frozenorb/apiv3/route/accessTokens/DELETEAccessTokensId.java +++ b/src/main/java/net/frozenorb/apiv3/web/route/accessTokens/DELETEAccessTokensId.java @@ -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; diff --git a/src/main/java/net/frozenorb/apiv3/route/accessTokens/GETAccessTokens.java b/src/main/java/net/frozenorb/apiv3/web/route/accessTokens/GETAccessTokens.java similarity index 84% rename from src/main/java/net/frozenorb/apiv3/route/accessTokens/GETAccessTokens.java rename to src/main/java/net/frozenorb/apiv3/web/route/accessTokens/GETAccessTokens.java index e3ec4f7..9bd821a 100644 --- a/src/main/java/net/frozenorb/apiv3/route/accessTokens/GETAccessTokens.java +++ b/src/main/java/net/frozenorb/apiv3/web/route/accessTokens/GETAccessTokens.java @@ -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; diff --git a/src/main/java/net/frozenorb/apiv3/route/accessTokens/GETAccessTokensId.java b/src/main/java/net/frozenorb/apiv3/web/route/accessTokens/GETAccessTokensId.java similarity index 84% rename from src/main/java/net/frozenorb/apiv3/route/accessTokens/GETAccessTokensId.java rename to src/main/java/net/frozenorb/apiv3/web/route/accessTokens/GETAccessTokensId.java index 9fd5a71..cd27487 100644 --- a/src/main/java/net/frozenorb/apiv3/route/accessTokens/GETAccessTokensId.java +++ b/src/main/java/net/frozenorb/apiv3/web/route/accessTokens/GETAccessTokensId.java @@ -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; diff --git a/src/main/java/net/frozenorb/apiv3/route/accessTokens/POSTAccessTokens.java b/src/main/java/net/frozenorb/apiv3/web/route/accessTokens/POSTAccessTokens.java similarity index 82% rename from src/main/java/net/frozenorb/apiv3/route/accessTokens/POSTAccessTokens.java rename to src/main/java/net/frozenorb/apiv3/web/route/accessTokens/POSTAccessTokens.java index a1349fb..01ef7d8 100644 --- a/src/main/java/net/frozenorb/apiv3/route/accessTokens/POSTAccessTokens.java +++ b/src/main/java/net/frozenorb/apiv3/web/route/accessTokens/POSTAccessTokens.java @@ -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; diff --git a/src/main/java/net/frozenorb/apiv3/route/auditLog/DELETEAuditLogId.java b/src/main/java/net/frozenorb/apiv3/web/route/auditLog/DELETEAuditLogId.java similarity index 87% rename from src/main/java/net/frozenorb/apiv3/route/auditLog/DELETEAuditLogId.java rename to src/main/java/net/frozenorb/apiv3/web/route/auditLog/DELETEAuditLogId.java index ab76ea0..0d4a035 100644 --- a/src/main/java/net/frozenorb/apiv3/route/auditLog/DELETEAuditLogId.java +++ b/src/main/java/net/frozenorb/apiv3/web/route/auditLog/DELETEAuditLogId.java @@ -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; diff --git a/src/main/java/net/frozenorb/apiv3/route/auditLog/GETAuditLog.java b/src/main/java/net/frozenorb/apiv3/web/route/auditLog/GETAuditLog.java similarity index 91% rename from src/main/java/net/frozenorb/apiv3/route/auditLog/GETAuditLog.java rename to src/main/java/net/frozenorb/apiv3/web/route/auditLog/GETAuditLog.java index a22fcd2..7918f86 100644 --- a/src/main/java/net/frozenorb/apiv3/route/auditLog/GETAuditLog.java +++ b/src/main/java/net/frozenorb/apiv3/web/route/auditLog/GETAuditLog.java @@ -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; diff --git a/src/main/java/net/frozenorb/apiv3/route/auditLog/POSTAuditLog.java b/src/main/java/net/frozenorb/apiv3/web/route/auditLog/POSTAuditLog.java similarity index 87% rename from src/main/java/net/frozenorb/apiv3/route/auditLog/POSTAuditLog.java rename to src/main/java/net/frozenorb/apiv3/web/route/auditLog/POSTAuditLog.java index 85ae21e..fe09ee8 100644 --- a/src/main/java/net/frozenorb/apiv3/route/auditLog/POSTAuditLog.java +++ b/src/main/java/net/frozenorb/apiv3/web/route/auditLog/POSTAuditLog.java @@ -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; diff --git a/src/main/java/net/frozenorb/apiv3/route/bannedAsns/DELETEBannedAsnsId.java b/src/main/java/net/frozenorb/apiv3/web/route/bannedAsns/DELETEBannedAsnsId.java similarity index 86% rename from src/main/java/net/frozenorb/apiv3/route/bannedAsns/DELETEBannedAsnsId.java rename to src/main/java/net/frozenorb/apiv3/web/route/bannedAsns/DELETEBannedAsnsId.java index 97a8b7d..4af2c8a 100644 --- a/src/main/java/net/frozenorb/apiv3/route/bannedAsns/DELETEBannedAsnsId.java +++ b/src/main/java/net/frozenorb/apiv3/web/route/bannedAsns/DELETEBannedAsnsId.java @@ -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; diff --git a/src/main/java/net/frozenorb/apiv3/route/bannedAsns/GETBannedAsns.java b/src/main/java/net/frozenorb/apiv3/web/route/bannedAsns/GETBannedAsns.java similarity index 77% rename from src/main/java/net/frozenorb/apiv3/route/bannedAsns/GETBannedAsns.java rename to src/main/java/net/frozenorb/apiv3/web/route/bannedAsns/GETBannedAsns.java index 14eec32..406c27a 100644 --- a/src/main/java/net/frozenorb/apiv3/route/bannedAsns/GETBannedAsns.java +++ b/src/main/java/net/frozenorb/apiv3/web/route/bannedAsns/GETBannedAsns.java @@ -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; diff --git a/src/main/java/net/frozenorb/apiv3/route/bannedAsns/GETBannedAsnsId.java b/src/main/java/net/frozenorb/apiv3/web/route/bannedAsns/GETBannedAsnsId.java similarity index 80% rename from src/main/java/net/frozenorb/apiv3/route/bannedAsns/GETBannedAsnsId.java rename to src/main/java/net/frozenorb/apiv3/web/route/bannedAsns/GETBannedAsnsId.java index 273d33c..ae52085 100644 --- a/src/main/java/net/frozenorb/apiv3/route/bannedAsns/GETBannedAsnsId.java +++ b/src/main/java/net/frozenorb/apiv3/web/route/bannedAsns/GETBannedAsnsId.java @@ -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; diff --git a/src/main/java/net/frozenorb/apiv3/route/bannedAsns/POSTBannedAsns.java b/src/main/java/net/frozenorb/apiv3/web/route/bannedAsns/POSTBannedAsns.java similarity index 84% rename from src/main/java/net/frozenorb/apiv3/route/bannedAsns/POSTBannedAsns.java rename to src/main/java/net/frozenorb/apiv3/web/route/bannedAsns/POSTBannedAsns.java index 125b6fa..982064b 100644 --- a/src/main/java/net/frozenorb/apiv3/route/bannedAsns/POSTBannedAsns.java +++ b/src/main/java/net/frozenorb/apiv3/web/route/bannedAsns/POSTBannedAsns.java @@ -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; diff --git a/src/main/java/net/frozenorb/apiv3/route/bannedAsns/PUTBannedAsnsId.java b/src/main/java/net/frozenorb/apiv3/web/route/bannedAsns/PUTBannedAsnsId.java similarity index 65% rename from src/main/java/net/frozenorb/apiv3/route/bannedAsns/PUTBannedAsnsId.java rename to src/main/java/net/frozenorb/apiv3/web/route/bannedAsns/PUTBannedAsnsId.java index 7332b0c..3bf5819 100644 --- a/src/main/java/net/frozenorb/apiv3/route/bannedAsns/PUTBannedAsnsId.java +++ b/src/main/java/net/frozenorb/apiv3/web/route/bannedAsns/PUTBannedAsnsId.java @@ -1,4 +1,4 @@ -package net.frozenorb.apiv3.route.bannedAsns; +package net.frozenorb.apiv3.web.route.bannedAsns; import org.springframework.stereotype.Component; diff --git a/src/main/java/net/frozenorb/apiv3/route/bannedCellCarriers/DELETEBannedCellCarriersId.java b/src/main/java/net/frozenorb/apiv3/web/route/bannedCellCarriers/DELETEBannedCellCarriersId.java similarity index 86% rename from src/main/java/net/frozenorb/apiv3/route/bannedCellCarriers/DELETEBannedCellCarriersId.java rename to src/main/java/net/frozenorb/apiv3/web/route/bannedCellCarriers/DELETEBannedCellCarriersId.java index e0f8236..3bf0902 100644 --- a/src/main/java/net/frozenorb/apiv3/route/bannedCellCarriers/DELETEBannedCellCarriersId.java +++ b/src/main/java/net/frozenorb/apiv3/web/route/bannedCellCarriers/DELETEBannedCellCarriersId.java @@ -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; diff --git a/src/main/java/net/frozenorb/apiv3/route/bannedCellCarriers/GETBannedCellCarriers.java b/src/main/java/net/frozenorb/apiv3/web/route/bannedCellCarriers/GETBannedCellCarriers.java similarity index 75% rename from src/main/java/net/frozenorb/apiv3/route/bannedCellCarriers/GETBannedCellCarriers.java rename to src/main/java/net/frozenorb/apiv3/web/route/bannedCellCarriers/GETBannedCellCarriers.java index ed9a0cc..2ee679d 100644 --- a/src/main/java/net/frozenorb/apiv3/route/bannedCellCarriers/GETBannedCellCarriers.java +++ b/src/main/java/net/frozenorb/apiv3/web/route/bannedCellCarriers/GETBannedCellCarriers.java @@ -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; diff --git a/src/main/java/net/frozenorb/apiv3/route/bannedCellCarriers/GETBannedCellCarriersId.java b/src/main/java/net/frozenorb/apiv3/web/route/bannedCellCarriers/GETBannedCellCarriersId.java similarity index 78% rename from src/main/java/net/frozenorb/apiv3/route/bannedCellCarriers/GETBannedCellCarriersId.java rename to src/main/java/net/frozenorb/apiv3/web/route/bannedCellCarriers/GETBannedCellCarriersId.java index ebf712e..bfd4046 100644 --- a/src/main/java/net/frozenorb/apiv3/route/bannedCellCarriers/GETBannedCellCarriersId.java +++ b/src/main/java/net/frozenorb/apiv3/web/route/bannedCellCarriers/GETBannedCellCarriersId.java @@ -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; diff --git a/src/main/java/net/frozenorb/apiv3/route/bannedCellCarriers/POSTBannedCellCarriers.java b/src/main/java/net/frozenorb/apiv3/web/route/bannedCellCarriers/POSTBannedCellCarriers.java similarity index 84% rename from src/main/java/net/frozenorb/apiv3/route/bannedCellCarriers/POSTBannedCellCarriers.java rename to src/main/java/net/frozenorb/apiv3/web/route/bannedCellCarriers/POSTBannedCellCarriers.java index d7796d6..d1e3428 100644 --- a/src/main/java/net/frozenorb/apiv3/route/bannedCellCarriers/POSTBannedCellCarriers.java +++ b/src/main/java/net/frozenorb/apiv3/web/route/bannedCellCarriers/POSTBannedCellCarriers.java @@ -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; diff --git a/src/main/java/net/frozenorb/apiv3/route/bannedCellCarriers/PUTBannedCellCarriersId.java b/src/main/java/net/frozenorb/apiv3/web/route/bannedCellCarriers/PUTBannedCellCarriersId.java similarity index 63% rename from src/main/java/net/frozenorb/apiv3/route/bannedCellCarriers/PUTBannedCellCarriersId.java rename to src/main/java/net/frozenorb/apiv3/web/route/bannedCellCarriers/PUTBannedCellCarriersId.java index 44146c4..31c46f5 100644 --- a/src/main/java/net/frozenorb/apiv3/route/bannedCellCarriers/PUTBannedCellCarriersId.java +++ b/src/main/java/net/frozenorb/apiv3/web/route/bannedCellCarriers/PUTBannedCellCarriersId.java @@ -1,4 +1,4 @@ -package net.frozenorb.apiv3.route.bannedCellCarriers; +package net.frozenorb.apiv3.web.route.bannedCellCarriers; import org.springframework.stereotype.Component; diff --git a/src/main/java/net/frozenorb/apiv3/route/chatFilter/DELETEChatFilterId.java b/src/main/java/net/frozenorb/apiv3/web/route/chatFilter/DELETEChatFilterId.java similarity index 86% rename from src/main/java/net/frozenorb/apiv3/route/chatFilter/DELETEChatFilterId.java rename to src/main/java/net/frozenorb/apiv3/web/route/chatFilter/DELETEChatFilterId.java index d2cab32..9c12808 100644 --- a/src/main/java/net/frozenorb/apiv3/route/chatFilter/DELETEChatFilterId.java +++ b/src/main/java/net/frozenorb/apiv3/web/route/chatFilter/DELETEChatFilterId.java @@ -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; diff --git a/src/main/java/net/frozenorb/apiv3/route/chatFilter/GETChatFilter.java b/src/main/java/net/frozenorb/apiv3/web/route/chatFilter/GETChatFilter.java similarity index 83% rename from src/main/java/net/frozenorb/apiv3/route/chatFilter/GETChatFilter.java rename to src/main/java/net/frozenorb/apiv3/web/route/chatFilter/GETChatFilter.java index ec013dc..854c9b8 100644 --- a/src/main/java/net/frozenorb/apiv3/route/chatFilter/GETChatFilter.java +++ b/src/main/java/net/frozenorb/apiv3/web/route/chatFilter/GETChatFilter.java @@ -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; diff --git a/src/main/java/net/frozenorb/apiv3/route/chatFilter/GETChatFilterId.java b/src/main/java/net/frozenorb/apiv3/web/route/chatFilter/GETChatFilterId.java similarity index 85% rename from src/main/java/net/frozenorb/apiv3/route/chatFilter/GETChatFilterId.java rename to src/main/java/net/frozenorb/apiv3/web/route/chatFilter/GETChatFilterId.java index ba83cdc..f1ab7d2 100644 --- a/src/main/java/net/frozenorb/apiv3/route/chatFilter/GETChatFilterId.java +++ b/src/main/java/net/frozenorb/apiv3/web/route/chatFilter/GETChatFilterId.java @@ -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; diff --git a/src/main/java/net/frozenorb/apiv3/route/chatFilter/POSTChatFilter.java b/src/main/java/net/frozenorb/apiv3/web/route/chatFilter/POSTChatFilter.java similarity index 85% rename from src/main/java/net/frozenorb/apiv3/route/chatFilter/POSTChatFilter.java rename to src/main/java/net/frozenorb/apiv3/web/route/chatFilter/POSTChatFilter.java index 811ba39..bfee22d 100644 --- a/src/main/java/net/frozenorb/apiv3/route/chatFilter/POSTChatFilter.java +++ b/src/main/java/net/frozenorb/apiv3/web/route/chatFilter/POSTChatFilter.java @@ -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; diff --git a/src/main/java/net/frozenorb/apiv3/route/chatFilter/PUTChatFilterId.java b/src/main/java/net/frozenorb/apiv3/web/route/chatFilter/PUTChatFilterId.java similarity index 65% rename from src/main/java/net/frozenorb/apiv3/route/chatFilter/PUTChatFilterId.java rename to src/main/java/net/frozenorb/apiv3/web/route/chatFilter/PUTChatFilterId.java index 6c1db9d..0d6c819 100644 --- a/src/main/java/net/frozenorb/apiv3/route/chatFilter/PUTChatFilterId.java +++ b/src/main/java/net/frozenorb/apiv3/web/route/chatFilter/PUTChatFilterId.java @@ -1,4 +1,4 @@ -package net.frozenorb.apiv3.route.chatFilter; +package net.frozenorb.apiv3.web.route.chatFilter; import org.springframework.stereotype.Component; diff --git a/src/main/java/net/frozenorb/apiv3/route/deployment/POSTDeploymentUpdateServer.java b/src/main/java/net/frozenorb/apiv3/web/route/deployment/POSTDeploymentUpdateServer.java similarity index 90% rename from src/main/java/net/frozenorb/apiv3/route/deployment/POSTDeploymentUpdateServer.java rename to src/main/java/net/frozenorb/apiv3/web/route/deployment/POSTDeploymentUpdateServer.java index f93265b..62a0052 100644 --- a/src/main/java/net/frozenorb/apiv3/route/deployment/POSTDeploymentUpdateServer.java +++ b/src/main/java/net/frozenorb/apiv3/web/route/deployment/POSTDeploymentUpdateServer.java @@ -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; diff --git a/src/main/java/net/frozenorb/apiv3/route/disposableLoginTokens/POSTDisposableLoginTokens.java b/src/main/java/net/frozenorb/apiv3/web/route/disposableLoginTokens/POSTDisposableLoginTokens.java similarity index 88% rename from src/main/java/net/frozenorb/apiv3/route/disposableLoginTokens/POSTDisposableLoginTokens.java rename to src/main/java/net/frozenorb/apiv3/web/route/disposableLoginTokens/POSTDisposableLoginTokens.java index d701162..8f5a089 100644 --- a/src/main/java/net/frozenorb/apiv3/route/disposableLoginTokens/POSTDisposableLoginTokens.java +++ b/src/main/java/net/frozenorb/apiv3/web/route/disposableLoginTokens/POSTDisposableLoginTokens.java @@ -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; diff --git a/src/main/java/net/frozenorb/apiv3/route/disposableLoginTokens/POSTDisposableLoginTokensIdUse.java b/src/main/java/net/frozenorb/apiv3/web/route/disposableLoginTokens/POSTDisposableLoginTokensIdUse.java similarity index 85% rename from src/main/java/net/frozenorb/apiv3/route/disposableLoginTokens/POSTDisposableLoginTokensIdUse.java rename to src/main/java/net/frozenorb/apiv3/web/route/disposableLoginTokens/POSTDisposableLoginTokensIdUse.java index 54e9298..5a588d2 100644 --- a/src/main/java/net/frozenorb/apiv3/route/disposableLoginTokens/POSTDisposableLoginTokensIdUse.java +++ b/src/main/java/net/frozenorb/apiv3/web/route/disposableLoginTokens/POSTDisposableLoginTokensIdUse.java @@ -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; diff --git a/src/main/java/net/frozenorb/apiv3/route/emailTokens/GETEmailTokensIdOwner.java b/src/main/java/net/frozenorb/apiv3/web/route/emailTokens/GETEmailTokensIdOwner.java similarity index 85% rename from src/main/java/net/frozenorb/apiv3/route/emailTokens/GETEmailTokensIdOwner.java rename to src/main/java/net/frozenorb/apiv3/web/route/emailTokens/GETEmailTokensIdOwner.java index 7fe51a1..e93ce46 100644 --- a/src/main/java/net/frozenorb/apiv3/route/emailTokens/GETEmailTokensIdOwner.java +++ b/src/main/java/net/frozenorb/apiv3/web/route/emailTokens/GETEmailTokensIdOwner.java @@ -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; diff --git a/src/main/java/net/frozenorb/apiv3/route/emailTokens/POSTEmailTokensIdConfirm.java b/src/main/java/net/frozenorb/apiv3/web/route/emailTokens/POSTEmailTokensIdConfirm.java similarity index 92% rename from src/main/java/net/frozenorb/apiv3/route/emailTokens/POSTEmailTokensIdConfirm.java rename to src/main/java/net/frozenorb/apiv3/web/route/emailTokens/POSTEmailTokensIdConfirm.java index 7796602..5b2eab4 100644 --- a/src/main/java/net/frozenorb/apiv3/route/emailTokens/POSTEmailTokensIdConfirm.java +++ b/src/main/java/net/frozenorb/apiv3/web/route/emailTokens/POSTEmailTokensIdConfirm.java @@ -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; diff --git a/src/main/java/net/frozenorb/apiv3/route/grants/DELETEGrantsId.java b/src/main/java/net/frozenorb/apiv3/web/route/grants/DELETEGrantsId.java similarity index 89% rename from src/main/java/net/frozenorb/apiv3/route/grants/DELETEGrantsId.java rename to src/main/java/net/frozenorb/apiv3/web/route/grants/DELETEGrantsId.java index c325432..97ae9a9 100644 --- a/src/main/java/net/frozenorb/apiv3/route/grants/DELETEGrantsId.java +++ b/src/main/java/net/frozenorb/apiv3/web/route/grants/DELETEGrantsId.java @@ -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; diff --git a/src/main/java/net/frozenorb/apiv3/route/grants/GETGrants.java b/src/main/java/net/frozenorb/apiv3/web/route/grants/GETGrants.java similarity index 93% rename from src/main/java/net/frozenorb/apiv3/route/grants/GETGrants.java rename to src/main/java/net/frozenorb/apiv3/web/route/grants/GETGrants.java index 9e4002e..bbe90a6 100644 --- a/src/main/java/net/frozenorb/apiv3/route/grants/GETGrants.java +++ b/src/main/java/net/frozenorb/apiv3/web/route/grants/GETGrants.java @@ -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; diff --git a/src/main/java/net/frozenorb/apiv3/route/grants/GETGrantsId.java b/src/main/java/net/frozenorb/apiv3/web/route/grants/GETGrantsId.java similarity index 85% rename from src/main/java/net/frozenorb/apiv3/route/grants/GETGrantsId.java rename to src/main/java/net/frozenorb/apiv3/web/route/grants/GETGrantsId.java index 5be5237..974e62b 100644 --- a/src/main/java/net/frozenorb/apiv3/route/grants/GETGrantsId.java +++ b/src/main/java/net/frozenorb/apiv3/web/route/grants/GETGrantsId.java @@ -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; diff --git a/src/main/java/net/frozenorb/apiv3/route/grants/POSTGrants.java b/src/main/java/net/frozenorb/apiv3/web/route/grants/POSTGrants.java similarity index 90% rename from src/main/java/net/frozenorb/apiv3/route/grants/POSTGrants.java rename to src/main/java/net/frozenorb/apiv3/web/route/grants/POSTGrants.java index 59b28b7..01ded24 100644 --- a/src/main/java/net/frozenorb/apiv3/route/grants/POSTGrants.java +++ b/src/main/java/net/frozenorb/apiv3/web/route/grants/POSTGrants.java @@ -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; diff --git a/src/main/java/net/frozenorb/apiv3/route/ipBans/DELETEIpBansId.java b/src/main/java/net/frozenorb/apiv3/web/route/ipBans/DELETEIpBansId.java similarity index 87% rename from src/main/java/net/frozenorb/apiv3/route/ipBans/DELETEIpBansId.java rename to src/main/java/net/frozenorb/apiv3/web/route/ipBans/DELETEIpBansId.java index 3a9b9ee..3962475 100644 --- a/src/main/java/net/frozenorb/apiv3/route/ipBans/DELETEIpBansId.java +++ b/src/main/java/net/frozenorb/apiv3/web/route/ipBans/DELETEIpBansId.java @@ -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; diff --git a/src/main/java/net/frozenorb/apiv3/route/ipBans/GETIpBans.java b/src/main/java/net/frozenorb/apiv3/web/route/ipBans/GETIpBans.java similarity index 92% rename from src/main/java/net/frozenorb/apiv3/route/ipBans/GETIpBans.java rename to src/main/java/net/frozenorb/apiv3/web/route/ipBans/GETIpBans.java index 4d11b5e..3451218 100644 --- a/src/main/java/net/frozenorb/apiv3/route/ipBans/GETIpBans.java +++ b/src/main/java/net/frozenorb/apiv3/web/route/ipBans/GETIpBans.java @@ -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; diff --git a/src/main/java/net/frozenorb/apiv3/route/ipBans/GETIpBansId.java b/src/main/java/net/frozenorb/apiv3/web/route/ipBans/GETIpBansId.java similarity index 85% rename from src/main/java/net/frozenorb/apiv3/route/ipBans/GETIpBansId.java rename to src/main/java/net/frozenorb/apiv3/web/route/ipBans/GETIpBansId.java index 271081e..b625df3 100644 --- a/src/main/java/net/frozenorb/apiv3/route/ipBans/GETIpBansId.java +++ b/src/main/java/net/frozenorb/apiv3/web/route/ipBans/GETIpBansId.java @@ -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 org.springframework.stereotype.Component; diff --git a/src/main/java/net/frozenorb/apiv3/route/ipBans/POSTIpBans.java b/src/main/java/net/frozenorb/apiv3/web/route/ipBans/POSTIpBans.java similarity index 89% rename from src/main/java/net/frozenorb/apiv3/route/ipBans/POSTIpBans.java rename to src/main/java/net/frozenorb/apiv3/web/route/ipBans/POSTIpBans.java index 1b2bc62..0d87217 100644 --- a/src/main/java/net/frozenorb/apiv3/route/ipBans/POSTIpBans.java +++ b/src/main/java/net/frozenorb/apiv3/web/route/ipBans/POSTIpBans.java @@ -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.IpUtils; import net.frozenorb.apiv3.util.SyncUtils; diff --git a/src/main/java/net/frozenorb/apiv3/route/ipIntel/GETIpInteld.java b/src/main/java/net/frozenorb/apiv3/web/route/ipIntel/GETIpInteld.java similarity index 91% rename from src/main/java/net/frozenorb/apiv3/route/ipIntel/GETIpInteld.java rename to src/main/java/net/frozenorb/apiv3/web/route/ipIntel/GETIpInteld.java index 01720e6..25b589d 100644 --- a/src/main/java/net/frozenorb/apiv3/route/ipIntel/GETIpInteld.java +++ b/src/main/java/net/frozenorb/apiv3/web/route/ipIntel/GETIpInteld.java @@ -1,7 +1,7 @@ -package net.frozenorb.apiv3.route.ipIntel; +package net.frozenorb.apiv3.web.route.ipIntel; import net.frozenorb.apiv3.APIv3; -import net.frozenorb.apiv3.model.IpIntel; +import net.frozenorb.apiv3.domain.IpIntel; import net.frozenorb.apiv3.util.ErrorUtils; import net.frozenorb.apiv3.util.IpUtils; diff --git a/src/main/java/net/frozenorb/apiv3/route/ipLog/GETIpLogId.java b/src/main/java/net/frozenorb/apiv3/web/route/ipLog/GETIpLogId.java similarity index 93% rename from src/main/java/net/frozenorb/apiv3/route/ipLog/GETIpLogId.java rename to src/main/java/net/frozenorb/apiv3/web/route/ipLog/GETIpLogId.java index a6f1008..dd0037f 100644 --- a/src/main/java/net/frozenorb/apiv3/route/ipLog/GETIpLogId.java +++ b/src/main/java/net/frozenorb/apiv3/web/route/ipLog/GETIpLogId.java @@ -1,7 +1,7 @@ -package net.frozenorb.apiv3.route.ipLog; +package net.frozenorb.apiv3.web.route.ipLog; import net.frozenorb.apiv3.APIv3; -import net.frozenorb.apiv3.model.IpLogEntry; +import net.frozenorb.apiv3.domain.IpLogEntry; import net.frozenorb.apiv3.util.ErrorUtils; import net.frozenorb.apiv3.util.UuidUtils; diff --git a/src/main/java/net/frozenorb/apiv3/route/lookup/POSTLookupByName.java b/src/main/java/net/frozenorb/apiv3/web/route/lookup/POSTLookupByName.java similarity index 98% rename from src/main/java/net/frozenorb/apiv3/route/lookup/POSTLookupByName.java rename to src/main/java/net/frozenorb/apiv3/web/route/lookup/POSTLookupByName.java index b85a6f9..64cc9b0 100644 --- a/src/main/java/net/frozenorb/apiv3/route/lookup/POSTLookupByName.java +++ b/src/main/java/net/frozenorb/apiv3/web/route/lookup/POSTLookupByName.java @@ -1,4 +1,4 @@ -package net.frozenorb.apiv3.route.lookup; +package net.frozenorb.apiv3.web.route.lookup; import com.google.common.collect.ImmutableMap; diff --git a/src/main/java/net/frozenorb/apiv3/route/lookup/POSTLookupByUuid.java b/src/main/java/net/frozenorb/apiv3/web/route/lookup/POSTLookupByUuid.java similarity index 98% rename from src/main/java/net/frozenorb/apiv3/route/lookup/POSTLookupByUuid.java rename to src/main/java/net/frozenorb/apiv3/web/route/lookup/POSTLookupByUuid.java index e785b7d..7fa9827 100644 --- a/src/main/java/net/frozenorb/apiv3/route/lookup/POSTLookupByUuid.java +++ b/src/main/java/net/frozenorb/apiv3/web/route/lookup/POSTLookupByUuid.java @@ -1,4 +1,4 @@ -package net.frozenorb.apiv3.route.lookup; +package net.frozenorb.apiv3.web.route.lookup; import com.mongodb.async.client.MongoCollection; import com.mongodb.async.client.MongoDatabase; diff --git a/src/main/java/net/frozenorb/apiv3/route/notificationTemplates/DELETENotificationTemplatesId.java b/src/main/java/net/frozenorb/apiv3/web/route/notificationTemplates/DELETENotificationTemplatesId.java similarity index 86% rename from src/main/java/net/frozenorb/apiv3/route/notificationTemplates/DELETENotificationTemplatesId.java rename to src/main/java/net/frozenorb/apiv3/web/route/notificationTemplates/DELETENotificationTemplatesId.java index 143ace7..70f885f 100644 --- a/src/main/java/net/frozenorb/apiv3/route/notificationTemplates/DELETENotificationTemplatesId.java +++ b/src/main/java/net/frozenorb/apiv3/web/route/notificationTemplates/DELETENotificationTemplatesId.java @@ -1,11 +1,11 @@ -package net.frozenorb.apiv3.route.notificationTemplates; +package net.frozenorb.apiv3.web.route.notificationTemplates; 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.NotificationTemplate; +import net.frozenorb.apiv3.service.auditlog.AuditLog; +import net.frozenorb.apiv3.service.auditlog.AuditLogActionType; +import net.frozenorb.apiv3.domain.NotificationTemplate; import net.frozenorb.apiv3.util.ErrorUtils; import net.frozenorb.apiv3.util.SyncUtils; import net.frozenorb.apiv3.util.UuidUtils; diff --git a/src/main/java/net/frozenorb/apiv3/route/notificationTemplates/GETNotificationTemplates.java b/src/main/java/net/frozenorb/apiv3/web/route/notificationTemplates/GETNotificationTemplates.java similarity index 82% rename from src/main/java/net/frozenorb/apiv3/route/notificationTemplates/GETNotificationTemplates.java rename to src/main/java/net/frozenorb/apiv3/web/route/notificationTemplates/GETNotificationTemplates.java index 9d3f338..157e02c 100644 --- a/src/main/java/net/frozenorb/apiv3/route/notificationTemplates/GETNotificationTemplates.java +++ b/src/main/java/net/frozenorb/apiv3/web/route/notificationTemplates/GETNotificationTemplates.java @@ -1,7 +1,7 @@ -package net.frozenorb.apiv3.route.notificationTemplates; +package net.frozenorb.apiv3.web.route.notificationTemplates; import net.frozenorb.apiv3.APIv3; -import net.frozenorb.apiv3.model.NotificationTemplate; +import net.frozenorb.apiv3.domain.NotificationTemplate; import net.frozenorb.apiv3.util.ErrorUtils; import org.springframework.stereotype.Component; diff --git a/src/main/java/net/frozenorb/apiv3/route/notificationTemplates/GETNotificationTemplatesId.java b/src/main/java/net/frozenorb/apiv3/web/route/notificationTemplates/GETNotificationTemplatesId.java similarity index 83% rename from src/main/java/net/frozenorb/apiv3/route/notificationTemplates/GETNotificationTemplatesId.java rename to src/main/java/net/frozenorb/apiv3/web/route/notificationTemplates/GETNotificationTemplatesId.java index a4d99e0..fe7783c 100644 --- a/src/main/java/net/frozenorb/apiv3/route/notificationTemplates/GETNotificationTemplatesId.java +++ b/src/main/java/net/frozenorb/apiv3/web/route/notificationTemplates/GETNotificationTemplatesId.java @@ -1,7 +1,7 @@ -package net.frozenorb.apiv3.route.notificationTemplates; +package net.frozenorb.apiv3.web.route.notificationTemplates; import net.frozenorb.apiv3.APIv3; -import net.frozenorb.apiv3.model.NotificationTemplate; +import net.frozenorb.apiv3.domain.NotificationTemplate; import net.frozenorb.apiv3.util.ErrorUtils; import org.springframework.stereotype.Component; diff --git a/src/main/java/net/frozenorb/apiv3/route/notificationTemplates/POSTNotificationTemplates.java b/src/main/java/net/frozenorb/apiv3/web/route/notificationTemplates/POSTNotificationTemplates.java similarity index 85% rename from src/main/java/net/frozenorb/apiv3/route/notificationTemplates/POSTNotificationTemplates.java rename to src/main/java/net/frozenorb/apiv3/web/route/notificationTemplates/POSTNotificationTemplates.java index 4a3623d..7aa47b3 100644 --- a/src/main/java/net/frozenorb/apiv3/route/notificationTemplates/POSTNotificationTemplates.java +++ b/src/main/java/net/frozenorb/apiv3/web/route/notificationTemplates/POSTNotificationTemplates.java @@ -1,11 +1,11 @@ -package net.frozenorb.apiv3.route.notificationTemplates; +package net.frozenorb.apiv3.web.route.notificationTemplates; 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.NotificationTemplate; +import net.frozenorb.apiv3.service.auditlog.AuditLog; +import net.frozenorb.apiv3.service.auditlog.AuditLogActionType; +import net.frozenorb.apiv3.domain.NotificationTemplate; import net.frozenorb.apiv3.util.ErrorUtils; import net.frozenorb.apiv3.util.SyncUtils; import net.frozenorb.apiv3.util.UuidUtils; diff --git a/src/main/java/net/frozenorb/apiv3/route/notificationTemplates/PUTNotificationTemplatesId.java b/src/main/java/net/frozenorb/apiv3/web/route/notificationTemplates/PUTNotificationTemplatesId.java similarity index 63% rename from src/main/java/net/frozenorb/apiv3/route/notificationTemplates/PUTNotificationTemplatesId.java rename to src/main/java/net/frozenorb/apiv3/web/route/notificationTemplates/PUTNotificationTemplatesId.java index af13250..0145ac7 100644 --- a/src/main/java/net/frozenorb/apiv3/route/notificationTemplates/PUTNotificationTemplatesId.java +++ b/src/main/java/net/frozenorb/apiv3/web/route/notificationTemplates/PUTNotificationTemplatesId.java @@ -1,4 +1,4 @@ -package net.frozenorb.apiv3.route.notificationTemplates; +package net.frozenorb.apiv3.web.route.notificationTemplates; import org.springframework.stereotype.Component; diff --git a/src/main/java/net/frozenorb/apiv3/route/phoneIntel/GETPhoneInteld.java b/src/main/java/net/frozenorb/apiv3/web/route/phoneIntel/GETPhoneInteld.java similarity index 89% rename from src/main/java/net/frozenorb/apiv3/route/phoneIntel/GETPhoneInteld.java rename to src/main/java/net/frozenorb/apiv3/web/route/phoneIntel/GETPhoneInteld.java index aa372a3..51253f2 100644 --- a/src/main/java/net/frozenorb/apiv3/route/phoneIntel/GETPhoneInteld.java +++ b/src/main/java/net/frozenorb/apiv3/web/route/phoneIntel/GETPhoneInteld.java @@ -1,7 +1,7 @@ -package net.frozenorb.apiv3.route.phoneIntel; +package net.frozenorb.apiv3.web.route.phoneIntel; import net.frozenorb.apiv3.APIv3; -import net.frozenorb.apiv3.model.PhoneIntel; +import net.frozenorb.apiv3.domain.PhoneIntel; import net.frozenorb.apiv3.util.ErrorUtils; import net.frozenorb.apiv3.util.PhoneUtils; diff --git a/src/main/java/net/frozenorb/apiv3/route/punishments/DELETEPunishmentsId.java b/src/main/java/net/frozenorb/apiv3/web/route/punishments/DELETEPunishmentsId.java similarity index 89% rename from src/main/java/net/frozenorb/apiv3/route/punishments/DELETEPunishmentsId.java rename to src/main/java/net/frozenorb/apiv3/web/route/punishments/DELETEPunishmentsId.java index 103b3da..738744a 100644 --- a/src/main/java/net/frozenorb/apiv3/route/punishments/DELETEPunishmentsId.java +++ b/src/main/java/net/frozenorb/apiv3/web/route/punishments/DELETEPunishmentsId.java @@ -1,12 +1,12 @@ -package net.frozenorb.apiv3.route.punishments; +package net.frozenorb.apiv3.web.route.punishments; 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.Punishment; -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.Punishment; +import net.frozenorb.apiv3.domain.User; import net.frozenorb.apiv3.unsorted.Permissions; import net.frozenorb.apiv3.util.ErrorUtils; import net.frozenorb.apiv3.util.SyncUtils; diff --git a/src/main/java/net/frozenorb/apiv3/route/punishments/DELETEUsersIdActivePunishment.java b/src/main/java/net/frozenorb/apiv3/web/route/punishments/DELETEUsersIdActivePunishment.java similarity index 89% rename from src/main/java/net/frozenorb/apiv3/route/punishments/DELETEUsersIdActivePunishment.java rename to src/main/java/net/frozenorb/apiv3/web/route/punishments/DELETEUsersIdActivePunishment.java index b05727a..c277cb3 100644 --- a/src/main/java/net/frozenorb/apiv3/route/punishments/DELETEUsersIdActivePunishment.java +++ b/src/main/java/net/frozenorb/apiv3/web/route/punishments/DELETEUsersIdActivePunishment.java @@ -1,14 +1,14 @@ -package net.frozenorb.apiv3.route.punishments; +package net.frozenorb.apiv3.web.route.punishments; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; 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.model.Punishment; -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.AuditLogEntry; +import net.frozenorb.apiv3.domain.Punishment; +import net.frozenorb.apiv3.domain.User; import net.frozenorb.apiv3.unsorted.Permissions; import net.frozenorb.apiv3.util.ErrorUtils; import net.frozenorb.apiv3.util.SyncUtils; diff --git a/src/main/java/net/frozenorb/apiv3/route/punishments/GETPunishments.java b/src/main/java/net/frozenorb/apiv3/web/route/punishments/GETPunishments.java similarity index 94% rename from src/main/java/net/frozenorb/apiv3/route/punishments/GETPunishments.java rename to src/main/java/net/frozenorb/apiv3/web/route/punishments/GETPunishments.java index 4c73b30..f2af995 100644 --- a/src/main/java/net/frozenorb/apiv3/route/punishments/GETPunishments.java +++ b/src/main/java/net/frozenorb/apiv3/web/route/punishments/GETPunishments.java @@ -1,7 +1,7 @@ -package net.frozenorb.apiv3.route.punishments; +package net.frozenorb.apiv3.web.route.punishments; import net.frozenorb.apiv3.APIv3; -import net.frozenorb.apiv3.model.Punishment; +import net.frozenorb.apiv3.domain.Punishment; import net.frozenorb.apiv3.util.ErrorUtils; import net.frozenorb.apiv3.util.UuidUtils; diff --git a/src/main/java/net/frozenorb/apiv3/route/punishments/GETPunishmentsId.java b/src/main/java/net/frozenorb/apiv3/web/route/punishments/GETPunishmentsId.java similarity index 85% rename from src/main/java/net/frozenorb/apiv3/route/punishments/GETPunishmentsId.java rename to src/main/java/net/frozenorb/apiv3/web/route/punishments/GETPunishmentsId.java index 7f74805..410058a 100644 --- a/src/main/java/net/frozenorb/apiv3/route/punishments/GETPunishmentsId.java +++ b/src/main/java/net/frozenorb/apiv3/web/route/punishments/GETPunishmentsId.java @@ -1,7 +1,7 @@ -package net.frozenorb.apiv3.route.punishments; +package net.frozenorb.apiv3.web.route.punishments; import net.frozenorb.apiv3.APIv3; -import net.frozenorb.apiv3.model.Punishment; +import net.frozenorb.apiv3.domain.Punishment; import net.frozenorb.apiv3.util.ErrorUtils; import org.springframework.stereotype.Component; diff --git a/src/main/java/net/frozenorb/apiv3/route/punishments/POSTPunishments.java b/src/main/java/net/frozenorb/apiv3/web/route/punishments/POSTPunishments.java similarity index 93% rename from src/main/java/net/frozenorb/apiv3/route/punishments/POSTPunishments.java rename to src/main/java/net/frozenorb/apiv3/web/route/punishments/POSTPunishments.java index 8c49717..a8fbe39 100644 --- a/src/main/java/net/frozenorb/apiv3/route/punishments/POSTPunishments.java +++ b/src/main/java/net/frozenorb/apiv3/web/route/punishments/POSTPunishments.java @@ -1,15 +1,15 @@ -package net.frozenorb.apiv3.route.punishments; +package net.frozenorb.apiv3.web.route.punishments; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; 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.IpLogEntry; -import net.frozenorb.apiv3.model.Punishment; -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.IpLogEntry; +import net.frozenorb.apiv3.domain.Punishment; +import net.frozenorb.apiv3.domain.User; import net.frozenorb.apiv3.unsorted.Permissions; import net.frozenorb.apiv3.util.ErrorUtils; import net.frozenorb.apiv3.util.IpUtils; diff --git a/src/main/java/net/frozenorb/apiv3/route/ranks/DELETERanksId.java b/src/main/java/net/frozenorb/apiv3/web/route/ranks/DELETERanksId.java similarity index 85% rename from src/main/java/net/frozenorb/apiv3/route/ranks/DELETERanksId.java rename to src/main/java/net/frozenorb/apiv3/web/route/ranks/DELETERanksId.java index af6596d..13cdb7c 100644 --- a/src/main/java/net/frozenorb/apiv3/route/ranks/DELETERanksId.java +++ b/src/main/java/net/frozenorb/apiv3/web/route/ranks/DELETERanksId.java @@ -1,11 +1,11 @@ -package net.frozenorb.apiv3.route.ranks; +package net.frozenorb.apiv3.web.route.ranks; 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.Rank; +import net.frozenorb.apiv3.service.auditlog.AuditLog; +import net.frozenorb.apiv3.service.auditlog.AuditLogActionType; +import net.frozenorb.apiv3.domain.Rank; import net.frozenorb.apiv3.util.ErrorUtils; import net.frozenorb.apiv3.util.SyncUtils; import net.frozenorb.apiv3.util.UuidUtils; diff --git a/src/main/java/net/frozenorb/apiv3/route/ranks/GETRanks.java b/src/main/java/net/frozenorb/apiv3/web/route/ranks/GETRanks.java similarity index 79% rename from src/main/java/net/frozenorb/apiv3/route/ranks/GETRanks.java rename to src/main/java/net/frozenorb/apiv3/web/route/ranks/GETRanks.java index 3a5ee2e..844d86d 100644 --- a/src/main/java/net/frozenorb/apiv3/route/ranks/GETRanks.java +++ b/src/main/java/net/frozenorb/apiv3/web/route/ranks/GETRanks.java @@ -1,7 +1,7 @@ -package net.frozenorb.apiv3.route.ranks; +package net.frozenorb.apiv3.web.route.ranks; import net.frozenorb.apiv3.APIv3; -import net.frozenorb.apiv3.model.Rank; +import net.frozenorb.apiv3.domain.Rank; import org.springframework.stereotype.Component; diff --git a/src/main/java/net/frozenorb/apiv3/route/ranks/GETRanksId.java b/src/main/java/net/frozenorb/apiv3/web/route/ranks/GETRanksId.java similarity index 80% rename from src/main/java/net/frozenorb/apiv3/route/ranks/GETRanksId.java rename to src/main/java/net/frozenorb/apiv3/web/route/ranks/GETRanksId.java index 10f3bf3..3bdc915 100644 --- a/src/main/java/net/frozenorb/apiv3/route/ranks/GETRanksId.java +++ b/src/main/java/net/frozenorb/apiv3/web/route/ranks/GETRanksId.java @@ -1,7 +1,7 @@ -package net.frozenorb.apiv3.route.ranks; +package net.frozenorb.apiv3.web.route.ranks; import net.frozenorb.apiv3.APIv3; -import net.frozenorb.apiv3.model.Rank; +import net.frozenorb.apiv3.domain.Rank; import org.springframework.stereotype.Component; diff --git a/src/main/java/net/frozenorb/apiv3/route/ranks/POSTRanks.java b/src/main/java/net/frozenorb/apiv3/web/route/ranks/POSTRanks.java similarity index 90% rename from src/main/java/net/frozenorb/apiv3/route/ranks/POSTRanks.java rename to src/main/java/net/frozenorb/apiv3/web/route/ranks/POSTRanks.java index 122c772..3d67276 100644 --- a/src/main/java/net/frozenorb/apiv3/route/ranks/POSTRanks.java +++ b/src/main/java/net/frozenorb/apiv3/web/route/ranks/POSTRanks.java @@ -1,11 +1,11 @@ -package net.frozenorb.apiv3.route.ranks; +package net.frozenorb.apiv3.web.route.ranks; 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.Rank; +import net.frozenorb.apiv3.service.auditlog.AuditLog; +import net.frozenorb.apiv3.service.auditlog.AuditLogActionType; +import net.frozenorb.apiv3.domain.Rank; import net.frozenorb.apiv3.util.ErrorUtils; import net.frozenorb.apiv3.util.SyncUtils; import net.frozenorb.apiv3.util.UuidUtils; diff --git a/src/main/java/net/frozenorb/apiv3/route/ranks/PUTRanksId.java b/src/main/java/net/frozenorb/apiv3/web/route/ranks/PUTRanksId.java similarity index 66% rename from src/main/java/net/frozenorb/apiv3/route/ranks/PUTRanksId.java rename to src/main/java/net/frozenorb/apiv3/web/route/ranks/PUTRanksId.java index b85ad4f..1a7646a 100644 --- a/src/main/java/net/frozenorb/apiv3/route/ranks/PUTRanksId.java +++ b/src/main/java/net/frozenorb/apiv3/web/route/ranks/PUTRanksId.java @@ -1,4 +1,4 @@ -package net.frozenorb.apiv3.route.ranks; +package net.frozenorb.apiv3.web.route.ranks; import org.springframework.stereotype.Component; diff --git a/src/main/java/net/frozenorb/apiv3/route/serverGroups/DELETEServerGroupsId.java b/src/main/java/net/frozenorb/apiv3/web/route/serverGroups/DELETEServerGroupsId.java similarity index 85% rename from src/main/java/net/frozenorb/apiv3/route/serverGroups/DELETEServerGroupsId.java rename to src/main/java/net/frozenorb/apiv3/web/route/serverGroups/DELETEServerGroupsId.java index 5ddcddf..3bae9f5 100644 --- a/src/main/java/net/frozenorb/apiv3/route/serverGroups/DELETEServerGroupsId.java +++ b/src/main/java/net/frozenorb/apiv3/web/route/serverGroups/DELETEServerGroupsId.java @@ -1,11 +1,11 @@ -package net.frozenorb.apiv3.route.serverGroups; +package net.frozenorb.apiv3.web.route.serverGroups; 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.ServerGroup; +import net.frozenorb.apiv3.service.auditlog.AuditLog; +import net.frozenorb.apiv3.service.auditlog.AuditLogActionType; +import net.frozenorb.apiv3.domain.ServerGroup; import net.frozenorb.apiv3.util.ErrorUtils; import net.frozenorb.apiv3.util.SyncUtils; import net.frozenorb.apiv3.util.UuidUtils; diff --git a/src/main/java/net/frozenorb/apiv3/route/serverGroups/GETServerGroups.java b/src/main/java/net/frozenorb/apiv3/web/route/serverGroups/GETServerGroups.java similarity index 77% rename from src/main/java/net/frozenorb/apiv3/route/serverGroups/GETServerGroups.java rename to src/main/java/net/frozenorb/apiv3/web/route/serverGroups/GETServerGroups.java index 9c23978..5bb212e 100644 --- a/src/main/java/net/frozenorb/apiv3/route/serverGroups/GETServerGroups.java +++ b/src/main/java/net/frozenorb/apiv3/web/route/serverGroups/GETServerGroups.java @@ -1,7 +1,7 @@ -package net.frozenorb.apiv3.route.serverGroups; +package net.frozenorb.apiv3.web.route.serverGroups; import net.frozenorb.apiv3.APIv3; -import net.frozenorb.apiv3.model.ServerGroup; +import net.frozenorb.apiv3.domain.ServerGroup; import org.springframework.stereotype.Component; diff --git a/src/main/java/net/frozenorb/apiv3/route/serverGroups/GETServerGroupsId.java b/src/main/java/net/frozenorb/apiv3/web/route/serverGroups/GETServerGroupsId.java similarity index 79% rename from src/main/java/net/frozenorb/apiv3/route/serverGroups/GETServerGroupsId.java rename to src/main/java/net/frozenorb/apiv3/web/route/serverGroups/GETServerGroupsId.java index 5b21210..9db9f4f 100644 --- a/src/main/java/net/frozenorb/apiv3/route/serverGroups/GETServerGroupsId.java +++ b/src/main/java/net/frozenorb/apiv3/web/route/serverGroups/GETServerGroupsId.java @@ -1,7 +1,7 @@ -package net.frozenorb.apiv3.route.serverGroups; +package net.frozenorb.apiv3.web.route.serverGroups; import net.frozenorb.apiv3.APIv3; -import net.frozenorb.apiv3.model.ServerGroup; +import net.frozenorb.apiv3.domain.ServerGroup; import org.springframework.stereotype.Component; diff --git a/src/main/java/net/frozenorb/apiv3/route/serverGroups/POSTServerGroups.java b/src/main/java/net/frozenorb/apiv3/web/route/serverGroups/POSTServerGroups.java similarity index 84% rename from src/main/java/net/frozenorb/apiv3/route/serverGroups/POSTServerGroups.java rename to src/main/java/net/frozenorb/apiv3/web/route/serverGroups/POSTServerGroups.java index f399e2e..94c6522 100644 --- a/src/main/java/net/frozenorb/apiv3/route/serverGroups/POSTServerGroups.java +++ b/src/main/java/net/frozenorb/apiv3/web/route/serverGroups/POSTServerGroups.java @@ -1,11 +1,11 @@ -package net.frozenorb.apiv3.route.serverGroups; +package net.frozenorb.apiv3.web.route.serverGroups; 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.ServerGroup; +import net.frozenorb.apiv3.service.auditlog.AuditLog; +import net.frozenorb.apiv3.service.auditlog.AuditLogActionType; +import net.frozenorb.apiv3.domain.ServerGroup; import net.frozenorb.apiv3.util.ErrorUtils; import net.frozenorb.apiv3.util.SyncUtils; import net.frozenorb.apiv3.util.UuidUtils; diff --git a/src/main/java/net/frozenorb/apiv3/route/serverGroups/PUTServerGroupsId.java b/src/main/java/net/frozenorb/apiv3/web/route/serverGroups/PUTServerGroupsId.java similarity index 65% rename from src/main/java/net/frozenorb/apiv3/route/serverGroups/PUTServerGroupsId.java rename to src/main/java/net/frozenorb/apiv3/web/route/serverGroups/PUTServerGroupsId.java index 167d87f..a31ee66 100644 --- a/src/main/java/net/frozenorb/apiv3/route/serverGroups/PUTServerGroupsId.java +++ b/src/main/java/net/frozenorb/apiv3/web/route/serverGroups/PUTServerGroupsId.java @@ -1,4 +1,4 @@ -package net.frozenorb.apiv3.route.serverGroups; +package net.frozenorb.apiv3.web.route.serverGroups; import org.springframework.stereotype.Component; diff --git a/src/main/java/net/frozenorb/apiv3/route/servers/DELETEServersId.java b/src/main/java/net/frozenorb/apiv3/web/route/servers/DELETEServersId.java similarity index 85% rename from src/main/java/net/frozenorb/apiv3/route/servers/DELETEServersId.java rename to src/main/java/net/frozenorb/apiv3/web/route/servers/DELETEServersId.java index 82ce650..3c49c04 100644 --- a/src/main/java/net/frozenorb/apiv3/route/servers/DELETEServersId.java +++ b/src/main/java/net/frozenorb/apiv3/web/route/servers/DELETEServersId.java @@ -1,13 +1,13 @@ -package net.frozenorb.apiv3.route.servers; +package net.frozenorb.apiv3.web.route.servers; 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.Server; +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.Server; import net.frozenorb.apiv3.util.ErrorUtils; import net.frozenorb.apiv3.util.SyncUtils; import net.frozenorb.apiv3.util.UuidUtils; diff --git a/src/main/java/net/frozenorb/apiv3/route/servers/GETServers.java b/src/main/java/net/frozenorb/apiv3/web/route/servers/GETServers.java similarity index 78% rename from src/main/java/net/frozenorb/apiv3/route/servers/GETServers.java rename to src/main/java/net/frozenorb/apiv3/web/route/servers/GETServers.java index d6ca2c0..046afe2 100644 --- a/src/main/java/net/frozenorb/apiv3/route/servers/GETServers.java +++ b/src/main/java/net/frozenorb/apiv3/web/route/servers/GETServers.java @@ -1,7 +1,7 @@ -package net.frozenorb.apiv3.route.servers; +package net.frozenorb.apiv3.web.route.servers; import net.frozenorb.apiv3.APIv3; -import net.frozenorb.apiv3.model.Server; +import net.frozenorb.apiv3.domain.Server; import org.springframework.stereotype.Component; diff --git a/src/main/java/net/frozenorb/apiv3/route/servers/GETServersId.java b/src/main/java/net/frozenorb/apiv3/web/route/servers/GETServersId.java similarity index 80% rename from src/main/java/net/frozenorb/apiv3/route/servers/GETServersId.java rename to src/main/java/net/frozenorb/apiv3/web/route/servers/GETServersId.java index 3504777..a397da2 100644 --- a/src/main/java/net/frozenorb/apiv3/route/servers/GETServersId.java +++ b/src/main/java/net/frozenorb/apiv3/web/route/servers/GETServersId.java @@ -1,7 +1,7 @@ -package net.frozenorb.apiv3.route.servers; +package net.frozenorb.apiv3.web.route.servers; import net.frozenorb.apiv3.APIv3; -import net.frozenorb.apiv3.model.Server; +import net.frozenorb.apiv3.domain.Server; import org.springframework.stereotype.Component; diff --git a/src/main/java/net/frozenorb/apiv3/route/servers/POSTServers.java b/src/main/java/net/frozenorb/apiv3/web/route/servers/POSTServers.java similarity index 85% rename from src/main/java/net/frozenorb/apiv3/route/servers/POSTServers.java rename to src/main/java/net/frozenorb/apiv3/web/route/servers/POSTServers.java index 3ee2425..71f8f7c 100644 --- a/src/main/java/net/frozenorb/apiv3/route/servers/POSTServers.java +++ b/src/main/java/net/frozenorb/apiv3/web/route/servers/POSTServers.java @@ -1,13 +1,13 @@ -package net.frozenorb.apiv3.route.servers; +package net.frozenorb.apiv3.web.route.servers; 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.model.Server; -import net.frozenorb.apiv3.model.ServerGroup; +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.Server; +import net.frozenorb.apiv3.domain.ServerGroup; import net.frozenorb.apiv3.util.ErrorUtils; import net.frozenorb.apiv3.util.IpUtils; import net.frozenorb.apiv3.util.SyncUtils; diff --git a/src/main/java/net/frozenorb/apiv3/route/servers/POSTServersHeartbeat.java b/src/main/java/net/frozenorb/apiv3/web/route/servers/POSTServersHeartbeat.java similarity index 94% rename from src/main/java/net/frozenorb/apiv3/route/servers/POSTServersHeartbeat.java rename to src/main/java/net/frozenorb/apiv3/web/route/servers/POSTServersHeartbeat.java index b3ce56b..6fc0362 100644 --- a/src/main/java/net/frozenorb/apiv3/route/servers/POSTServersHeartbeat.java +++ b/src/main/java/net/frozenorb/apiv3/web/route/servers/POSTServersHeartbeat.java @@ -1,18 +1,18 @@ -package net.frozenorb.apiv3.route.servers; +package net.frozenorb.apiv3.web.route.servers; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; 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.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.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.unsorted.MongoToVertxCallback; import net.frozenorb.apiv3.util.ErrorUtils; import net.frozenorb.apiv3.util.IpUtils; diff --git a/src/main/java/net/frozenorb/apiv3/route/servers/PUTServersId.java b/src/main/java/net/frozenorb/apiv3/web/route/servers/PUTServersId.java similarity index 66% rename from src/main/java/net/frozenorb/apiv3/route/servers/PUTServersId.java rename to src/main/java/net/frozenorb/apiv3/web/route/servers/PUTServersId.java index 32016b2..4c0f0f8 100644 --- a/src/main/java/net/frozenorb/apiv3/route/servers/PUTServersId.java +++ b/src/main/java/net/frozenorb/apiv3/web/route/servers/PUTServersId.java @@ -1,4 +1,4 @@ -package net.frozenorb.apiv3.route.servers; +package net.frozenorb.apiv3.web.route.servers; import org.springframework.stereotype.Component; diff --git a/src/main/java/net/frozenorb/apiv3/route/users/GETStaff.java b/src/main/java/net/frozenorb/apiv3/web/route/users/GETStaff.java similarity index 90% rename from src/main/java/net/frozenorb/apiv3/route/users/GETStaff.java rename to src/main/java/net/frozenorb/apiv3/web/route/users/GETStaff.java index faa9dac..e661d2d 100644 --- a/src/main/java/net/frozenorb/apiv3/route/users/GETStaff.java +++ b/src/main/java/net/frozenorb/apiv3/web/route/users/GETStaff.java @@ -1,9 +1,9 @@ -package net.frozenorb.apiv3.route.users; +package net.frozenorb.apiv3.web.route.users; import net.frozenorb.apiv3.APIv3; -import net.frozenorb.apiv3.model.Grant; -import net.frozenorb.apiv3.model.Rank; -import net.frozenorb.apiv3.model.User; +import net.frozenorb.apiv3.domain.Grant; +import net.frozenorb.apiv3.domain.Rank; +import net.frozenorb.apiv3.domain.User; import net.frozenorb.apiv3.util.SyncUtils; import org.springframework.stereotype.Component; diff --git a/src/main/java/net/frozenorb/apiv3/route/users/GETUsersId.java b/src/main/java/net/frozenorb/apiv3/web/route/users/GETUsersId.java similarity index 86% rename from src/main/java/net/frozenorb/apiv3/route/users/GETUsersId.java rename to src/main/java/net/frozenorb/apiv3/web/route/users/GETUsersId.java index ce24908..8de15bb 100644 --- a/src/main/java/net/frozenorb/apiv3/route/users/GETUsersId.java +++ b/src/main/java/net/frozenorb/apiv3/web/route/users/GETUsersId.java @@ -1,7 +1,7 @@ -package net.frozenorb.apiv3.route.users; +package net.frozenorb.apiv3.web.route.users; 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; diff --git a/src/main/java/net/frozenorb/apiv3/route/users/GETUsersIdCompoundedPermissions.java b/src/main/java/net/frozenorb/apiv3/web/route/users/GETUsersIdCompoundedPermissions.java similarity index 91% rename from src/main/java/net/frozenorb/apiv3/route/users/GETUsersIdCompoundedPermissions.java rename to src/main/java/net/frozenorb/apiv3/web/route/users/GETUsersIdCompoundedPermissions.java index 0adf761..20a615b 100644 --- a/src/main/java/net/frozenorb/apiv3/route/users/GETUsersIdCompoundedPermissions.java +++ b/src/main/java/net/frozenorb/apiv3/web/route/users/GETUsersIdCompoundedPermissions.java @@ -1,7 +1,7 @@ -package net.frozenorb.apiv3.route.users; +package net.frozenorb.apiv3.web.route.users; 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.PermissionUtils; diff --git a/src/main/java/net/frozenorb/apiv3/route/users/GETUsersIdDetails.java b/src/main/java/net/frozenorb/apiv3/web/route/users/GETUsersIdDetails.java similarity index 84% rename from src/main/java/net/frozenorb/apiv3/route/users/GETUsersIdDetails.java rename to src/main/java/net/frozenorb/apiv3/web/route/users/GETUsersIdDetails.java index a9188bf..681eb3a 100644 --- a/src/main/java/net/frozenorb/apiv3/route/users/GETUsersIdDetails.java +++ b/src/main/java/net/frozenorb/apiv3/web/route/users/GETUsersIdDetails.java @@ -1,10 +1,10 @@ -package net.frozenorb.apiv3.route.users; +package net.frozenorb.apiv3.web.route.users; import net.frozenorb.apiv3.APIv3; -import net.frozenorb.apiv3.model.Grant; -import net.frozenorb.apiv3.model.IpLogEntry; -import net.frozenorb.apiv3.model.Punishment; -import net.frozenorb.apiv3.model.User; +import net.frozenorb.apiv3.domain.Grant; +import net.frozenorb.apiv3.domain.IpLogEntry; +import net.frozenorb.apiv3.domain.Punishment; +import net.frozenorb.apiv3.domain.User; import net.frozenorb.apiv3.util.ErrorUtils; import net.frozenorb.apiv3.util.SyncUtils; diff --git a/src/main/java/net/frozenorb/apiv3/route/users/GETUsersIdRequiresTotp.java b/src/main/java/net/frozenorb/apiv3/web/route/users/GETUsersIdRequiresTotp.java similarity index 89% rename from src/main/java/net/frozenorb/apiv3/route/users/GETUsersIdRequiresTotp.java rename to src/main/java/net/frozenorb/apiv3/web/route/users/GETUsersIdRequiresTotp.java index 177f9f2..185aa9b 100644 --- a/src/main/java/net/frozenorb/apiv3/route/users/GETUsersIdRequiresTotp.java +++ b/src/main/java/net/frozenorb/apiv3/web/route/users/GETUsersIdRequiresTotp.java @@ -1,10 +1,10 @@ -package net.frozenorb.apiv3.route.users; +package net.frozenorb.apiv3.web.route.users; import com.google.common.collect.ImmutableMap; import net.frozenorb.apiv3.APIv3; -import net.frozenorb.apiv3.model.User; -import net.frozenorb.apiv3.totp.RequiresTotpResult; +import net.frozenorb.apiv3.domain.User; +import net.frozenorb.apiv3.service.totp.RequiresTotpResult; import net.frozenorb.apiv3.util.ErrorUtils; import net.frozenorb.apiv3.util.IpUtils; diff --git a/src/main/java/net/frozenorb/apiv3/route/users/GETUsersIdVerifyPassword.java b/src/main/java/net/frozenorb/apiv3/web/route/users/GETUsersIdVerifyPassword.java similarity index 89% rename from src/main/java/net/frozenorb/apiv3/route/users/GETUsersIdVerifyPassword.java rename to src/main/java/net/frozenorb/apiv3/web/route/users/GETUsersIdVerifyPassword.java index edbeb22..b4e2ad8 100644 --- a/src/main/java/net/frozenorb/apiv3/route/users/GETUsersIdVerifyPassword.java +++ b/src/main/java/net/frozenorb/apiv3/web/route/users/GETUsersIdVerifyPassword.java @@ -1,12 +1,12 @@ -package net.frozenorb.apiv3.route.users; +package net.frozenorb.apiv3.web.route.users; import com.mongodb.async.SingleResultCallback; 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.usersession.UserSessionService; +import net.frozenorb.apiv3.service.auditlog.AuditLog; +import net.frozenorb.apiv3.service.auditlog.AuditLogActionType; +import net.frozenorb.apiv3.domain.User; +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; diff --git a/src/main/java/net/frozenorb/apiv3/route/users/POSTUsersIdChangePassword.java b/src/main/java/net/frozenorb/apiv3/web/route/users/POSTUsersIdChangePassword.java similarity index 88% rename from src/main/java/net/frozenorb/apiv3/route/users/POSTUsersIdChangePassword.java rename to src/main/java/net/frozenorb/apiv3/web/route/users/POSTUsersIdChangePassword.java index 5002212..6db8f78 100644 --- a/src/main/java/net/frozenorb/apiv3/route/users/POSTUsersIdChangePassword.java +++ b/src/main/java/net/frozenorb/apiv3/web/route/users/POSTUsersIdChangePassword.java @@ -1,14 +1,14 @@ -package net.frozenorb.apiv3.route.users; +package net.frozenorb.apiv3.web.route.users; 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.totp.RequiresTotpResult; -import net.frozenorb.apiv3.totp.TotpAuthorizationResult; -import net.frozenorb.apiv3.usersession.UserSessionService; +import net.frozenorb.apiv3.service.auditlog.AuditLog; +import net.frozenorb.apiv3.service.auditlog.AuditLogActionType; +import net.frozenorb.apiv3.domain.User; +import net.frozenorb.apiv3.service.totp.RequiresTotpResult; +import net.frozenorb.apiv3.service.totp.TotpAuthorizationResult; +import net.frozenorb.apiv3.service.usersession.UserSessionService; import net.frozenorb.apiv3.util.ErrorUtils; import net.frozenorb.apiv3.util.IpUtils; import net.frozenorb.apiv3.util.PasswordUtils; diff --git a/src/main/java/net/frozenorb/apiv3/route/users/POSTUsersIdConfirmPhone.java b/src/main/java/net/frozenorb/apiv3/web/route/users/POSTUsersIdConfirmPhone.java similarity index 93% rename from src/main/java/net/frozenorb/apiv3/route/users/POSTUsersIdConfirmPhone.java rename to src/main/java/net/frozenorb/apiv3/web/route/users/POSTUsersIdConfirmPhone.java index 4387051..39e6195 100644 --- a/src/main/java/net/frozenorb/apiv3/route/users/POSTUsersIdConfirmPhone.java +++ b/src/main/java/net/frozenorb/apiv3/web/route/users/POSTUsersIdConfirmPhone.java @@ -1,11 +1,11 @@ -package net.frozenorb.apiv3.route.users; +package net.frozenorb.apiv3.web.route.users; 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.SyncUtils; diff --git a/src/main/java/net/frozenorb/apiv3/route/users/POSTUsersIdLogin.java b/src/main/java/net/frozenorb/apiv3/web/route/users/POSTUsersIdLogin.java similarity index 92% rename from src/main/java/net/frozenorb/apiv3/route/users/POSTUsersIdLogin.java rename to src/main/java/net/frozenorb/apiv3/web/route/users/POSTUsersIdLogin.java index eada7d7..768a596 100644 --- a/src/main/java/net/frozenorb/apiv3/route/users/POSTUsersIdLogin.java +++ b/src/main/java/net/frozenorb/apiv3/web/route/users/POSTUsersIdLogin.java @@ -1,15 +1,15 @@ -package net.frozenorb.apiv3.route.users; +package net.frozenorb.apiv3.web.route.users; import com.google.common.collect.ImmutableMap; import com.mongodb.async.SingleResultCallback; import net.frozenorb.apiv3.APIv3; -import net.frozenorb.apiv3.actor.Actor; -import net.frozenorb.apiv3.actor.ActorType; -import net.frozenorb.apiv3.model.IpLogEntry; -import net.frozenorb.apiv3.model.Server; -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.IpLogEntry; +import net.frozenorb.apiv3.domain.Server; +import net.frozenorb.apiv3.domain.User; import net.frozenorb.apiv3.util.ErrorUtils; import net.frozenorb.apiv3.util.IpUtils; import net.frozenorb.apiv3.util.UuidUtils; diff --git a/src/main/java/net/frozenorb/apiv3/route/users/POSTUsersIdNotify.java b/src/main/java/net/frozenorb/apiv3/web/route/users/POSTUsersIdNotify.java similarity index 90% rename from src/main/java/net/frozenorb/apiv3/route/users/POSTUsersIdNotify.java rename to src/main/java/net/frozenorb/apiv3/web/route/users/POSTUsersIdNotify.java index 1b52572..4933d14 100644 --- a/src/main/java/net/frozenorb/apiv3/route/users/POSTUsersIdNotify.java +++ b/src/main/java/net/frozenorb/apiv3/web/route/users/POSTUsersIdNotify.java @@ -1,11 +1,11 @@ -package net.frozenorb.apiv3.route.users; +package net.frozenorb.apiv3.web.route.users; import com.google.common.collect.ImmutableMap; import net.frozenorb.apiv3.APIv3; -import net.frozenorb.apiv3.email.EmailService; -import net.frozenorb.apiv3.model.NotificationTemplate; -import net.frozenorb.apiv3.model.User; +import net.frozenorb.apiv3.service.email.EmailService; +import net.frozenorb.apiv3.domain.NotificationTemplate; +import net.frozenorb.apiv3.domain.User; import net.frozenorb.apiv3.unsorted.Notification; import net.frozenorb.apiv3.util.ErrorUtils; import net.frozenorb.apiv3.util.SyncUtils; diff --git a/src/main/java/net/frozenorb/apiv3/route/users/POSTUsersIdPasswordReset.java b/src/main/java/net/frozenorb/apiv3/web/route/users/POSTUsersIdPasswordReset.java similarity index 88% rename from src/main/java/net/frozenorb/apiv3/route/users/POSTUsersIdPasswordReset.java rename to src/main/java/net/frozenorb/apiv3/web/route/users/POSTUsersIdPasswordReset.java index 6322579..af728a3 100644 --- a/src/main/java/net/frozenorb/apiv3/route/users/POSTUsersIdPasswordReset.java +++ b/src/main/java/net/frozenorb/apiv3/web/route/users/POSTUsersIdPasswordReset.java @@ -1,13 +1,13 @@ -package net.frozenorb.apiv3.route.users; +package net.frozenorb.apiv3.web.route.users; 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.email.EmailService; -import net.frozenorb.apiv3.model.NotificationTemplate; -import net.frozenorb.apiv3.model.User; +import net.frozenorb.apiv3.service.auditlog.AuditLog; +import net.frozenorb.apiv3.service.auditlog.AuditLogActionType; +import net.frozenorb.apiv3.service.email.EmailService; +import net.frozenorb.apiv3.domain.NotificationTemplate; +import net.frozenorb.apiv3.domain.User; import net.frozenorb.apiv3.unsorted.Notification; import net.frozenorb.apiv3.util.ErrorUtils; import net.frozenorb.apiv3.util.IpUtils; diff --git a/src/main/java/net/frozenorb/apiv3/route/users/POSTUsersIdRegisterEmail.java b/src/main/java/net/frozenorb/apiv3/web/route/users/POSTUsersIdRegisterEmail.java similarity index 89% rename from src/main/java/net/frozenorb/apiv3/route/users/POSTUsersIdRegisterEmail.java rename to src/main/java/net/frozenorb/apiv3/web/route/users/POSTUsersIdRegisterEmail.java index e75d570..56f73a6 100644 --- a/src/main/java/net/frozenorb/apiv3/route/users/POSTUsersIdRegisterEmail.java +++ b/src/main/java/net/frozenorb/apiv3/web/route/users/POSTUsersIdRegisterEmail.java @@ -1,14 +1,14 @@ -package net.frozenorb.apiv3.route.users; +package net.frozenorb.apiv3.web.route.users; 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.email.EmailDomainService; -import net.frozenorb.apiv3.email.EmailService; -import net.frozenorb.apiv3.model.NotificationTemplate; -import net.frozenorb.apiv3.model.User; +import net.frozenorb.apiv3.service.auditlog.AuditLog; +import net.frozenorb.apiv3.service.auditlog.AuditLogActionType; +import net.frozenorb.apiv3.service.emaildomain.EmailDomainService; +import net.frozenorb.apiv3.service.email.EmailService; +import net.frozenorb.apiv3.domain.NotificationTemplate; +import net.frozenorb.apiv3.domain.User; import net.frozenorb.apiv3.unsorted.Notification; import net.frozenorb.apiv3.util.EmailUtils; import net.frozenorb.apiv3.util.ErrorUtils; diff --git a/src/main/java/net/frozenorb/apiv3/route/users/POSTUsersIdRegisterPhone.java b/src/main/java/net/frozenorb/apiv3/web/route/users/POSTUsersIdRegisterPhone.java similarity index 88% rename from src/main/java/net/frozenorb/apiv3/route/users/POSTUsersIdRegisterPhone.java rename to src/main/java/net/frozenorb/apiv3/web/route/users/POSTUsersIdRegisterPhone.java index 2fa5e06..6265578 100644 --- a/src/main/java/net/frozenorb/apiv3/route/users/POSTUsersIdRegisterPhone.java +++ b/src/main/java/net/frozenorb/apiv3/web/route/users/POSTUsersIdRegisterPhone.java @@ -1,15 +1,15 @@ -package net.frozenorb.apiv3.route.users; +package net.frozenorb.apiv3.web.route.users; 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.model.NotificationTemplate; -import net.frozenorb.apiv3.model.PhoneIntel; -import net.frozenorb.apiv3.model.User; -import net.frozenorb.apiv3.sms.SmsService; +import net.frozenorb.apiv3.service.auditlog.AuditLog; +import net.frozenorb.apiv3.service.auditlog.AuditLogActionType; +import net.frozenorb.apiv3.domain.BannedCellCarrier; +import net.frozenorb.apiv3.domain.NotificationTemplate; +import net.frozenorb.apiv3.domain.PhoneIntel; +import net.frozenorb.apiv3.domain.User; +import net.frozenorb.apiv3.service.sms.SmsService; import net.frozenorb.apiv3.unsorted.Notification; import net.frozenorb.apiv3.util.ErrorUtils; import net.frozenorb.apiv3.util.IpUtils; diff --git a/src/main/java/net/frozenorb/apiv3/route/users/POSTUsersIdSetupTotp.java b/src/main/java/net/frozenorb/apiv3/web/route/users/POSTUsersIdSetupTotp.java similarity index 87% rename from src/main/java/net/frozenorb/apiv3/route/users/POSTUsersIdSetupTotp.java rename to src/main/java/net/frozenorb/apiv3/web/route/users/POSTUsersIdSetupTotp.java index 81f300b..c89557c 100644 --- a/src/main/java/net/frozenorb/apiv3/route/users/POSTUsersIdSetupTotp.java +++ b/src/main/java/net/frozenorb/apiv3/web/route/users/POSTUsersIdSetupTotp.java @@ -1,12 +1,12 @@ -package net.frozenorb.apiv3.route.users; +package net.frozenorb.apiv3.web.route.users; 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.totp.TotpService; +import net.frozenorb.apiv3.service.auditlog.AuditLog; +import net.frozenorb.apiv3.service.auditlog.AuditLogActionType; +import net.frozenorb.apiv3.domain.User; +import net.frozenorb.apiv3.service.totp.TotpService; import net.frozenorb.apiv3.util.ErrorUtils; import net.frozenorb.apiv3.util.IpUtils; import net.frozenorb.apiv3.util.SyncUtils; diff --git a/src/main/java/net/frozenorb/apiv3/route/users/POSTUsersIdVerifyTotp.java b/src/main/java/net/frozenorb/apiv3/web/route/users/POSTUsersIdVerifyTotp.java similarity index 89% rename from src/main/java/net/frozenorb/apiv3/route/users/POSTUsersIdVerifyTotp.java rename to src/main/java/net/frozenorb/apiv3/web/route/users/POSTUsersIdVerifyTotp.java index 42f6408..425f277 100644 --- a/src/main/java/net/frozenorb/apiv3/route/users/POSTUsersIdVerifyTotp.java +++ b/src/main/java/net/frozenorb/apiv3/web/route/users/POSTUsersIdVerifyTotp.java @@ -1,11 +1,11 @@ -package net.frozenorb.apiv3.route.users; +package net.frozenorb.apiv3.web.route.users; 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; diff --git a/src/main/java/net/frozenorb/apiv3/route/users/POSTUsersUsePasswordResetToken.java b/src/main/java/net/frozenorb/apiv3/web/route/users/POSTUsersUsePasswordResetToken.java similarity index 91% rename from src/main/java/net/frozenorb/apiv3/route/users/POSTUsersUsePasswordResetToken.java rename to src/main/java/net/frozenorb/apiv3/web/route/users/POSTUsersUsePasswordResetToken.java index e6a2edd..5427a04 100644 --- a/src/main/java/net/frozenorb/apiv3/route/users/POSTUsersUsePasswordResetToken.java +++ b/src/main/java/net/frozenorb/apiv3/web/route/users/POSTUsersUsePasswordResetToken.java @@ -1,12 +1,12 @@ -package net.frozenorb.apiv3.route.users; +package net.frozenorb.apiv3.web.route.users; 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.usersession.UserSessionService; +import net.frozenorb.apiv3.service.auditlog.AuditLog; +import net.frozenorb.apiv3.service.auditlog.AuditLogActionType; +import net.frozenorb.apiv3.domain.User; +import net.frozenorb.apiv3.service.usersession.UserSessionService; import net.frozenorb.apiv3.util.ErrorUtils; import net.frozenorb.apiv3.util.IpUtils; import net.frozenorb.apiv3.util.PasswordUtils; diff --git a/src/main/resources/log4j.xml b/src/main/resources/log4j.xml deleted file mode 100644 index 4ef59d6..0000000 --- a/src/main/resources/log4j.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file