diff --git a/src/main/java/fr/javatic/mongo/jacksonCodec/JacksonCodecProvider.java b/src/main/java/fr/javatic/mongo/jacksonCodec/JacksonCodecProvider.java index 43686aa..84b51f8 100644 --- a/src/main/java/fr/javatic/mongo/jacksonCodec/JacksonCodecProvider.java +++ b/src/main/java/fr/javatic/mongo/jacksonCodec/JacksonCodecProvider.java @@ -1,6 +1,7 @@ package fr.javatic.mongo.jacksonCodec; import com.fasterxml.jackson.databind.ObjectMapper; + import org.bson.codecs.Codec; import org.bson.codecs.configuration.CodecProvider; import org.bson.codecs.configuration.CodecRegistry; diff --git a/src/main/java/net/frozenorb/apiv3/APIv3.java b/src/main/java/net/frozenorb/apiv3/APIv3.java index 42eda73..fca9e66 100644 --- a/src/main/java/net/frozenorb/apiv3/APIv3.java +++ b/src/main/java/net/frozenorb/apiv3/APIv3.java @@ -1,5 +1,10 @@ package net.frozenorb.apiv3; +import com.google.common.collect.ImmutableList; +import com.google.common.net.MediaType; +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; + import com.codahale.metrics.MetricRegistry; import com.codahale.metrics.SharedMetricRegistries; import com.fasterxml.jackson.annotation.JsonAutoDetect; @@ -7,10 +12,6 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.PropertyAccessor; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.module.SimpleModule; -import com.google.common.collect.ImmutableList; -import com.google.common.net.MediaType; -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; import com.librato.metrics.LibratoReporter; import com.mongodb.ConnectionString; import com.mongodb.MongoCredential; @@ -20,29 +21,21 @@ import com.mongodb.async.client.MongoClients; import com.mongodb.async.client.MongoDatabase; import com.mongodb.client.model.IndexModel; import com.mongodb.connection.ClusterSettings; -import fr.javatic.mongo.jacksonCodec.JacksonCodecProvider; -import fr.javatic.mongo.jacksonCodec.ObjectMapperFactory; -import io.vertx.core.AbstractVerticle; -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.Getter; -import lombok.extern.slf4j.Slf4j; + 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.*; -import net.frozenorb.apiv3.route.*; +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.GETMetrics; +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; @@ -83,7 +76,11 @@ 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.*; +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; @@ -92,8 +89,27 @@ 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.*; -import net.frozenorb.apiv3.route.users.*; +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.serialization.jackson.InstantJsonDeserializer; @@ -102,6 +118,7 @@ import net.frozenorb.apiv3.serialization.jackson.UuidJsonDeserializer; import net.frozenorb.apiv3.serialization.jackson.UuidJsonSerializer; import net.frozenorb.apiv3.serialization.mongodb.UuidCodecProvider; import net.frozenorb.apiv3.util.EmailUtils; + import org.bson.Document; import org.bson.codecs.BsonValueCodecProvider; import org.bson.codecs.DocumentCodecProvider; @@ -117,6 +134,24 @@ import java.util.Properties; import java.util.UUID; import java.util.concurrent.TimeUnit; +import fr.javatic.mongo.jacksonCodec.JacksonCodecProvider; +import fr.javatic.mongo.jacksonCodec.ObjectMapperFactory; +import io.vertx.core.AbstractVerticle; +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.Getter; +import lombok.extern.slf4j.Slf4j; + @Slf4j public final class APIv3 extends AbstractVerticle { diff --git a/src/main/java/net/frozenorb/apiv3/auditLog/AuditLog.java b/src/main/java/net/frozenorb/apiv3/auditLog/AuditLog.java index abe5185..41b59dd 100644 --- a/src/main/java/net/frozenorb/apiv3/auditLog/AuditLog.java +++ b/src/main/java/net/frozenorb/apiv3/auditLog/AuditLog.java @@ -1,14 +1,17 @@ package net.frozenorb.apiv3.auditLog; import com.google.common.collect.ImmutableMap; + import com.mongodb.async.SingleResultCallback; -import io.vertx.ext.web.RoutingContext; -import lombok.experimental.UtilityClass; + import net.frozenorb.apiv3.model.AuditLogEntry; import java.util.Map; import java.util.UUID; +import io.vertx.ext.web.RoutingContext; +import lombok.experimental.UtilityClass; + @UtilityClass public class AuditLog { diff --git a/src/main/java/net/frozenorb/apiv3/auditLog/AuditLogActionType.java b/src/main/java/net/frozenorb/apiv3/auditLog/AuditLogActionType.java index 3af7486..bab4010 100644 --- a/src/main/java/net/frozenorb/apiv3/auditLog/AuditLogActionType.java +++ b/src/main/java/net/frozenorb/apiv3/auditLog/AuditLogActionType.java @@ -1,12 +1,14 @@ package net.frozenorb.apiv3.auditLog; import com.mongodb.async.SingleResultCallback; -import lombok.Getter; + import net.frozenorb.apiv3.model.AuditLogEntry; import net.frozenorb.apiv3.model.Punishment; import java.time.Instant; +import lombok.Getter; + public enum AuditLogActionType { // TODO diff --git a/src/main/java/net/frozenorb/apiv3/filter/AuthenticationFilter.java b/src/main/java/net/frozenorb/apiv3/filter/AuthenticationFilter.java index 6595a4d..8c581ab 100644 --- a/src/main/java/net/frozenorb/apiv3/filter/AuthenticationFilter.java +++ b/src/main/java/net/frozenorb/apiv3/filter/AuthenticationFilter.java @@ -1,13 +1,15 @@ package net.frozenorb.apiv3.filter; import com.google.common.collect.ImmutableMap; -import io.vertx.core.Handler; -import io.vertx.ext.web.RoutingContext; + import net.frozenorb.apiv3.actor.ActorType; import net.frozenorb.apiv3.actor.SimpleActor; import net.frozenorb.apiv3.model.AccessToken; import net.frozenorb.apiv3.util.ErrorUtils; +import io.vertx.core.Handler; +import io.vertx.ext.web.RoutingContext; + public final class AuthenticationFilter implements Handler { @Override diff --git a/src/main/java/net/frozenorb/apiv3/filter/AuthorizationFilter.java b/src/main/java/net/frozenorb/apiv3/filter/AuthorizationFilter.java index 9422ddf..031d990 100644 --- a/src/main/java/net/frozenorb/apiv3/filter/AuthorizationFilter.java +++ b/src/main/java/net/frozenorb/apiv3/filter/AuthorizationFilter.java @@ -1,11 +1,13 @@ package net.frozenorb.apiv3.filter; import com.google.common.collect.ImmutableMap; -import io.vertx.core.Handler; -import io.vertx.ext.web.RoutingContext; + import net.frozenorb.apiv3.actor.Actor; import net.frozenorb.apiv3.util.ErrorUtils; +import io.vertx.core.Handler; +import io.vertx.ext.web.RoutingContext; + public final class AuthorizationFilter implements Handler { @Override diff --git a/src/main/java/net/frozenorb/apiv3/filter/MetricsFilter.java b/src/main/java/net/frozenorb/apiv3/filter/MetricsFilter.java index b171c21..268e9fa 100644 --- a/src/main/java/net/frozenorb/apiv3/filter/MetricsFilter.java +++ b/src/main/java/net/frozenorb/apiv3/filter/MetricsFilter.java @@ -1,10 +1,11 @@ package net.frozenorb.apiv3.filter; +import net.frozenorb.apiv3.APIv3; + import io.vertx.core.Handler; import io.vertx.ext.web.RoutingContext; import io.vertx.redis.RedisClient; import io.vertx.redis.RedisOptions; -import net.frozenorb.apiv3.APIv3; public final class MetricsFilter implements Handler { diff --git a/src/main/java/net/frozenorb/apiv3/filter/WebsiteUserSessionFilter.java b/src/main/java/net/frozenorb/apiv3/filter/WebsiteUserSessionFilter.java index 517e53b..4e5099d 100644 --- a/src/main/java/net/frozenorb/apiv3/filter/WebsiteUserSessionFilter.java +++ b/src/main/java/net/frozenorb/apiv3/filter/WebsiteUserSessionFilter.java @@ -1,16 +1,18 @@ package net.frozenorb.apiv3.filter; import com.google.common.collect.ImmutableMap; -import io.vertx.core.Handler; -import io.vertx.core.http.HttpMethod; -import io.vertx.ext.web.RoutingContext; -import lombok.extern.slf4j.Slf4j; + import net.frozenorb.apiv3.actor.Actor; import net.frozenorb.apiv3.actor.ActorType; import net.frozenorb.apiv3.util.ErrorUtils; import net.frozenorb.apiv3.util.IpUtils; import net.frozenorb.apiv3.util.UserSessionUtils; +import io.vertx.core.Handler; +import io.vertx.core.http.HttpMethod; +import io.vertx.ext.web.RoutingContext; +import lombok.extern.slf4j.Slf4j; + @Slf4j public final class WebsiteUserSessionFilter implements Handler { diff --git a/src/main/java/net/frozenorb/apiv3/maxmind/MaxMindCity.java b/src/main/java/net/frozenorb/apiv3/maxmind/MaxMindCity.java index 10f82fe..e768e98 100644 --- a/src/main/java/net/frozenorb/apiv3/maxmind/MaxMindCity.java +++ b/src/main/java/net/frozenorb/apiv3/maxmind/MaxMindCity.java @@ -1,8 +1,9 @@ package net.frozenorb.apiv3.maxmind; +import net.frozenorb.apiv3.util.MaxMindUtils; + import io.vertx.core.json.JsonObject; import lombok.Getter; -import net.frozenorb.apiv3.util.MaxMindUtils; public final class MaxMindCity { diff --git a/src/main/java/net/frozenorb/apiv3/maxmind/MaxMindContinent.java b/src/main/java/net/frozenorb/apiv3/maxmind/MaxMindContinent.java index a606112..9949c22 100644 --- a/src/main/java/net/frozenorb/apiv3/maxmind/MaxMindContinent.java +++ b/src/main/java/net/frozenorb/apiv3/maxmind/MaxMindContinent.java @@ -1,8 +1,9 @@ package net.frozenorb.apiv3.maxmind; +import net.frozenorb.apiv3.util.MaxMindUtils; + import io.vertx.core.json.JsonObject; import lombok.Getter; -import net.frozenorb.apiv3.util.MaxMindUtils; public final class MaxMindContinent { diff --git a/src/main/java/net/frozenorb/apiv3/maxmind/MaxMindCountry.java b/src/main/java/net/frozenorb/apiv3/maxmind/MaxMindCountry.java index 029c7a8..68db137 100644 --- a/src/main/java/net/frozenorb/apiv3/maxmind/MaxMindCountry.java +++ b/src/main/java/net/frozenorb/apiv3/maxmind/MaxMindCountry.java @@ -1,8 +1,9 @@ package net.frozenorb.apiv3.maxmind; +import net.frozenorb.apiv3.util.MaxMindUtils; + import io.vertx.core.json.JsonObject; import lombok.Getter; -import net.frozenorb.apiv3.util.MaxMindUtils; public final class MaxMindCountry { diff --git a/src/main/java/net/frozenorb/apiv3/maxmind/MaxMindRegisteredCountry.java b/src/main/java/net/frozenorb/apiv3/maxmind/MaxMindRegisteredCountry.java index 6e38cf0..958b112 100644 --- a/src/main/java/net/frozenorb/apiv3/maxmind/MaxMindRegisteredCountry.java +++ b/src/main/java/net/frozenorb/apiv3/maxmind/MaxMindRegisteredCountry.java @@ -1,8 +1,9 @@ package net.frozenorb.apiv3.maxmind; +import net.frozenorb.apiv3.util.MaxMindUtils; + import io.vertx.core.json.JsonObject; import lombok.Getter; -import net.frozenorb.apiv3.util.MaxMindUtils; public final class MaxMindRegisteredCountry { diff --git a/src/main/java/net/frozenorb/apiv3/maxmind/MaxMindResult.java b/src/main/java/net/frozenorb/apiv3/maxmind/MaxMindResult.java index bb79a60..e5f34ec 100644 --- a/src/main/java/net/frozenorb/apiv3/maxmind/MaxMindResult.java +++ b/src/main/java/net/frozenorb/apiv3/maxmind/MaxMindResult.java @@ -1,13 +1,14 @@ package net.frozenorb.apiv3.maxmind; import com.google.common.collect.ImmutableList; -import io.vertx.core.json.JsonArray; -import io.vertx.core.json.JsonObject; -import lombok.Getter; import java.util.LinkedList; import java.util.List; +import io.vertx.core.json.JsonArray; +import io.vertx.core.json.JsonObject; +import lombok.Getter; + public final class MaxMindResult { @Getter private MaxMindContinent continent; diff --git a/src/main/java/net/frozenorb/apiv3/maxmind/MaxMindSubdivision.java b/src/main/java/net/frozenorb/apiv3/maxmind/MaxMindSubdivision.java index 94f6738..6ad6b78 100644 --- a/src/main/java/net/frozenorb/apiv3/maxmind/MaxMindSubdivision.java +++ b/src/main/java/net/frozenorb/apiv3/maxmind/MaxMindSubdivision.java @@ -1,8 +1,9 @@ package net.frozenorb.apiv3.maxmind; +import net.frozenorb.apiv3.util.MaxMindUtils; + import io.vertx.core.json.JsonObject; import lombok.Getter; -import net.frozenorb.apiv3.util.MaxMindUtils; public final class MaxMindSubdivision { diff --git a/src/main/java/net/frozenorb/apiv3/model/AccessToken.java b/src/main/java/net/frozenorb/apiv3/model/AccessToken.java index 52d5194..0ca44fe 100644 --- a/src/main/java/net/frozenorb/apiv3/model/AccessToken.java +++ b/src/main/java/net/frozenorb/apiv3/model/AccessToken.java @@ -1,16 +1,15 @@ package net.frozenorb.apiv3.model; import com.google.common.collect.ImmutableList; + import com.mongodb.async.SingleResultCallback; import com.mongodb.async.client.MongoCollection; -import fr.javatic.mongo.jacksonCodec.Entity; -import fr.javatic.mongo.jacksonCodec.objectId.Id; -import lombok.AllArgsConstructor; -import lombok.Getter; + import net.frozenorb.apiv3.APIv3; import net.frozenorb.apiv3.actor.ActorType; import net.frozenorb.apiv3.unsorted.MongoToVoidMongoCallback; import net.frozenorb.apiv3.util.SyncUtils; + import org.bson.Document; import java.time.Instant; @@ -18,6 +17,11 @@ import java.util.LinkedList; import java.util.List; import java.util.UUID; +import fr.javatic.mongo.jacksonCodec.Entity; +import fr.javatic.mongo.jacksonCodec.objectId.Id; +import lombok.AllArgsConstructor; +import lombok.Getter; + @Entity @AllArgsConstructor public final class AccessToken { diff --git a/src/main/java/net/frozenorb/apiv3/model/AuditLogEntry.java b/src/main/java/net/frozenorb/apiv3/model/AuditLogEntry.java index bec6217..2c76c25 100644 --- a/src/main/java/net/frozenorb/apiv3/model/AuditLogEntry.java +++ b/src/main/java/net/frozenorb/apiv3/model/AuditLogEntry.java @@ -1,16 +1,16 @@ package net.frozenorb.apiv3.model; import com.google.common.collect.ImmutableMap; + import com.mongodb.async.SingleResultCallback; import com.mongodb.async.client.MongoCollection; -import fr.javatic.mongo.jacksonCodec.Entity; -import fr.javatic.mongo.jacksonCodec.objectId.Id; -import lombok.Getter; + import net.frozenorb.apiv3.APIv3; import net.frozenorb.apiv3.actor.Actor; import net.frozenorb.apiv3.actor.ActorType; import net.frozenorb.apiv3.auditLog.AuditLogActionType; import net.frozenorb.apiv3.util.SyncUtils; + import org.bson.Document; import org.bson.types.ObjectId; @@ -20,6 +20,10 @@ import java.util.List; import java.util.Map; import java.util.UUID; +import fr.javatic.mongo.jacksonCodec.Entity; +import fr.javatic.mongo.jacksonCodec.objectId.Id; +import lombok.Getter; + @Entity public final class AuditLogEntry { diff --git a/src/main/java/net/frozenorb/apiv3/model/BannedAsn.java b/src/main/java/net/frozenorb/apiv3/model/BannedAsn.java index 29f92e8..d132a62 100644 --- a/src/main/java/net/frozenorb/apiv3/model/BannedAsn.java +++ b/src/main/java/net/frozenorb/apiv3/model/BannedAsn.java @@ -1,15 +1,14 @@ package net.frozenorb.apiv3.model; import com.google.common.collect.ImmutableList; + import com.mongodb.async.SingleResultCallback; import com.mongodb.async.client.MongoCollection; -import fr.javatic.mongo.jacksonCodec.Entity; -import fr.javatic.mongo.jacksonCodec.objectId.Id; -import lombok.Getter; -import lombok.Setter; + import net.frozenorb.apiv3.APIv3; import net.frozenorb.apiv3.unsorted.MongoToVoidMongoCallback; import net.frozenorb.apiv3.util.SyncUtils; + import org.bson.Document; import java.time.Instant; @@ -19,6 +18,11 @@ import java.util.List; import java.util.Map; import java.util.concurrent.TimeUnit; +import fr.javatic.mongo.jacksonCodec.Entity; +import fr.javatic.mongo.jacksonCodec.objectId.Id; +import lombok.Getter; +import lombok.Setter; + @Entity public final class BannedAsn { diff --git a/src/main/java/net/frozenorb/apiv3/model/BannedCellCarrier.java b/src/main/java/net/frozenorb/apiv3/model/BannedCellCarrier.java index 3c1f760..dfb0654 100644 --- a/src/main/java/net/frozenorb/apiv3/model/BannedCellCarrier.java +++ b/src/main/java/net/frozenorb/apiv3/model/BannedCellCarrier.java @@ -2,15 +2,14 @@ package net.frozenorb.apiv3.model; import com.google.common.collect.ImmutableList; + import com.mongodb.async.SingleResultCallback; import com.mongodb.async.client.MongoCollection; -import fr.javatic.mongo.jacksonCodec.Entity; -import fr.javatic.mongo.jacksonCodec.objectId.Id; -import lombok.Getter; -import lombok.Setter; + import net.frozenorb.apiv3.APIv3; import net.frozenorb.apiv3.unsorted.MongoToVoidMongoCallback; import net.frozenorb.apiv3.util.SyncUtils; + import org.bson.Document; import java.time.Instant; @@ -20,6 +19,11 @@ import java.util.List; import java.util.Map; import java.util.concurrent.TimeUnit; +import fr.javatic.mongo.jacksonCodec.Entity; +import fr.javatic.mongo.jacksonCodec.objectId.Id; +import lombok.Getter; +import lombok.Setter; + @Entity public final class BannedCellCarrier { diff --git a/src/main/java/net/frozenorb/apiv3/model/ChatFilterEntry.java b/src/main/java/net/frozenorb/apiv3/model/ChatFilterEntry.java index 38dcf87..b269473 100644 --- a/src/main/java/net/frozenorb/apiv3/model/ChatFilterEntry.java +++ b/src/main/java/net/frozenorb/apiv3/model/ChatFilterEntry.java @@ -2,17 +2,20 @@ package net.frozenorb.apiv3.model; import com.mongodb.async.SingleResultCallback; import com.mongodb.async.client.MongoCollection; -import fr.javatic.mongo.jacksonCodec.Entity; -import fr.javatic.mongo.jacksonCodec.objectId.Id; -import lombok.Getter; + import net.frozenorb.apiv3.APIv3; import net.frozenorb.apiv3.unsorted.MongoToVoidMongoCallback; import net.frozenorb.apiv3.util.SyncUtils; + import org.bson.Document; import java.util.LinkedList; import java.util.List; +import fr.javatic.mongo.jacksonCodec.Entity; +import fr.javatic.mongo.jacksonCodec.objectId.Id; +import lombok.Getter; + @Entity public final class ChatFilterEntry { diff --git a/src/main/java/net/frozenorb/apiv3/model/Grant.java b/src/main/java/net/frozenorb/apiv3/model/Grant.java index 6ff6786..6e9d198 100644 --- a/src/main/java/net/frozenorb/apiv3/model/Grant.java +++ b/src/main/java/net/frozenorb/apiv3/model/Grant.java @@ -1,22 +1,33 @@ package net.frozenorb.apiv3.model; import com.google.common.collect.Collections2; + import com.mongodb.async.SingleResultCallback; import com.mongodb.async.client.MongoCollection; -import fr.javatic.mongo.jacksonCodec.Entity; -import fr.javatic.mongo.jacksonCodec.objectId.Id; -import lombok.AllArgsConstructor; -import lombok.Getter; + import net.frozenorb.apiv3.APIv3; import net.frozenorb.apiv3.unsorted.MongoToVoidMongoCallback; import net.frozenorb.apiv3.util.SyncUtils; + import org.bson.Document; import org.bson.types.ObjectId; import java.time.Instant; -import java.util.*; +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.UUID; import java.util.stream.Collectors; +import fr.javatic.mongo.jacksonCodec.Entity; +import fr.javatic.mongo.jacksonCodec.objectId.Id; +import lombok.AllArgsConstructor; +import lombok.Getter; + @Entity @AllArgsConstructor public final class Grant { diff --git a/src/main/java/net/frozenorb/apiv3/model/IpBan.java b/src/main/java/net/frozenorb/apiv3/model/IpBan.java index 3010432..4377aef 100644 --- a/src/main/java/net/frozenorb/apiv3/model/IpBan.java +++ b/src/main/java/net/frozenorb/apiv3/model/IpBan.java @@ -2,21 +2,28 @@ package net.frozenorb.apiv3.model; import com.mongodb.async.SingleResultCallback; import com.mongodb.async.client.MongoCollection; -import fr.javatic.mongo.jacksonCodec.Entity; -import fr.javatic.mongo.jacksonCodec.objectId.Id; -import lombok.AllArgsConstructor; -import lombok.Getter; + import net.frozenorb.apiv3.APIv3; import net.frozenorb.apiv3.actor.Actor; import net.frozenorb.apiv3.actor.ActorType; import net.frozenorb.apiv3.unsorted.MongoToVoidMongoCallback; import net.frozenorb.apiv3.util.SyncUtils; import net.frozenorb.apiv3.util.TimeUtils; + import org.bson.Document; import org.bson.types.ObjectId; import java.time.Instant; -import java.util.*; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.UUID; + +import fr.javatic.mongo.jacksonCodec.Entity; +import fr.javatic.mongo.jacksonCodec.objectId.Id; +import lombok.AllArgsConstructor; +import lombok.Getter; @Entity @AllArgsConstructor diff --git a/src/main/java/net/frozenorb/apiv3/model/IpIntel.java b/src/main/java/net/frozenorb/apiv3/model/IpIntel.java index d22d729..3e0e0fe 100644 --- a/src/main/java/net/frozenorb/apiv3/model/IpIntel.java +++ b/src/main/java/net/frozenorb/apiv3/model/IpIntel.java @@ -2,8 +2,26 @@ package net.frozenorb.apiv3.model; import com.google.common.base.Charsets; import com.google.common.hash.Hashing; + import com.mongodb.async.SingleResultCallback; import com.mongodb.async.client.MongoCollection; + +import net.frozenorb.apiv3.APIv3; +import net.frozenorb.apiv3.maxmind.MaxMindResult; +import net.frozenorb.apiv3.util.GeoJsonPoint; +import net.frozenorb.apiv3.util.MaxMindUtils; +import net.frozenorb.apiv3.util.SyncUtils; + +import org.bson.Document; + +import java.time.Instant; +import java.util.ArrayList; +import java.util.Collection; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + import fr.javatic.mongo.jacksonCodec.Entity; import fr.javatic.mongo.jacksonCodec.objectId.Id; import io.vertx.core.CompositeFuture; @@ -11,16 +29,6 @@ import io.vertx.core.Future; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.Setter; -import net.frozenorb.apiv3.APIv3; -import net.frozenorb.apiv3.maxmind.MaxMindResult; -import net.frozenorb.apiv3.util.GeoJsonPoint; -import net.frozenorb.apiv3.util.MaxMindUtils; -import net.frozenorb.apiv3.util.SyncUtils; -import org.bson.Document; - -import java.time.Instant; -import java.util.*; -import java.util.concurrent.ConcurrentHashMap; @Entity @AllArgsConstructor diff --git a/src/main/java/net/frozenorb/apiv3/model/IpLogEntry.java b/src/main/java/net/frozenorb/apiv3/model/IpLogEntry.java index 5197df0..d19a8ce 100644 --- a/src/main/java/net/frozenorb/apiv3/model/IpLogEntry.java +++ b/src/main/java/net/frozenorb/apiv3/model/IpLogEntry.java @@ -2,15 +2,14 @@ package net.frozenorb.apiv3.model; import com.google.common.base.Charsets; import com.google.common.hash.Hashing; + import com.mongodb.async.SingleResultCallback; import com.mongodb.async.client.MongoCollection; -import fr.javatic.mongo.jacksonCodec.Entity; -import fr.javatic.mongo.jacksonCodec.objectId.Id; -import lombok.AllArgsConstructor; -import lombok.Getter; + import net.frozenorb.apiv3.APIv3; import net.frozenorb.apiv3.unsorted.MongoToVoidMongoCallback; import net.frozenorb.apiv3.util.SyncUtils; + import org.bson.Document; import org.bson.types.ObjectId; @@ -19,6 +18,11 @@ import java.util.LinkedList; import java.util.List; import java.util.UUID; +import fr.javatic.mongo.jacksonCodec.Entity; +import fr.javatic.mongo.jacksonCodec.objectId.Id; +import lombok.AllArgsConstructor; +import lombok.Getter; + @Entity @AllArgsConstructor public final class IpLogEntry { diff --git a/src/main/java/net/frozenorb/apiv3/model/NotificationTemplate.java b/src/main/java/net/frozenorb/apiv3/model/NotificationTemplate.java index 2886378..260d1c0 100644 --- a/src/main/java/net/frozenorb/apiv3/model/NotificationTemplate.java +++ b/src/main/java/net/frozenorb/apiv3/model/NotificationTemplate.java @@ -2,19 +2,22 @@ package net.frozenorb.apiv3.model; import com.mongodb.async.SingleResultCallback; import com.mongodb.async.client.MongoCollection; -import fr.javatic.mongo.jacksonCodec.Entity; -import fr.javatic.mongo.jacksonCodec.objectId.Id; -import lombok.Getter; -import lombok.Setter; + import net.frozenorb.apiv3.APIv3; import net.frozenorb.apiv3.unsorted.MongoToVoidMongoCallback; import net.frozenorb.apiv3.util.SyncUtils; + import org.bson.Document; import java.util.LinkedList; import java.util.List; import java.util.Map; +import fr.javatic.mongo.jacksonCodec.Entity; +import fr.javatic.mongo.jacksonCodec.objectId.Id; +import lombok.Getter; +import lombok.Setter; + @Entity public final class NotificationTemplate { diff --git a/src/main/java/net/frozenorb/apiv3/model/PhoneIntel.java b/src/main/java/net/frozenorb/apiv3/model/PhoneIntel.java index 0b294ac..3896c63 100644 --- a/src/main/java/net/frozenorb/apiv3/model/PhoneIntel.java +++ b/src/main/java/net/frozenorb/apiv3/model/PhoneIntel.java @@ -2,21 +2,24 @@ package net.frozenorb.apiv3.model; import com.mongodb.async.SingleResultCallback; import com.mongodb.async.client.MongoCollection; -import fr.javatic.mongo.jacksonCodec.Entity; -import fr.javatic.mongo.jacksonCodec.objectId.Id; -import lombok.AllArgsConstructor; -import lombok.Getter; + import net.frozenorb.apiv3.APIv3; import net.frozenorb.apiv3.util.PhoneUtils; import net.frozenorb.apiv3.util.SyncUtils; import net.frozenorb.apiv3.util.ZangUtils; import net.frozenorb.apiv3.zang.ZangResult; + import org.bson.Document; import java.time.Instant; import java.util.LinkedList; import java.util.List; +import fr.javatic.mongo.jacksonCodec.Entity; +import fr.javatic.mongo.jacksonCodec.objectId.Id; +import lombok.AllArgsConstructor; +import lombok.Getter; + @Entity @AllArgsConstructor public final class PhoneIntel { diff --git a/src/main/java/net/frozenorb/apiv3/model/Punishment.java b/src/main/java/net/frozenorb/apiv3/model/Punishment.java index 0394258..0a3cd1d 100644 --- a/src/main/java/net/frozenorb/apiv3/model/Punishment.java +++ b/src/main/java/net/frozenorb/apiv3/model/Punishment.java @@ -2,23 +2,31 @@ package net.frozenorb.apiv3.model; import com.mongodb.async.SingleResultCallback; import com.mongodb.async.client.MongoCollection; -import fr.javatic.mongo.jacksonCodec.Entity; -import fr.javatic.mongo.jacksonCodec.objectId.Id; -import lombok.AllArgsConstructor; -import lombok.Getter; + import net.frozenorb.apiv3.APIv3; import net.frozenorb.apiv3.actor.Actor; import net.frozenorb.apiv3.actor.ActorType; import net.frozenorb.apiv3.unsorted.MongoToVoidMongoCallback; import net.frozenorb.apiv3.util.SyncUtils; import net.frozenorb.apiv3.util.TimeUtils; + import org.bson.Document; import org.bson.types.ObjectId; import java.time.Instant; -import java.util.*; +import java.util.Collection; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.UUID; import java.util.stream.Collectors; +import fr.javatic.mongo.jacksonCodec.Entity; +import fr.javatic.mongo.jacksonCodec.objectId.Id; +import lombok.AllArgsConstructor; +import lombok.Getter; + @Entity @AllArgsConstructor public final class Punishment { diff --git a/src/main/java/net/frozenorb/apiv3/model/Rank.java b/src/main/java/net/frozenorb/apiv3/model/Rank.java index 3b41a5b..53b54de 100644 --- a/src/main/java/net/frozenorb/apiv3/model/Rank.java +++ b/src/main/java/net/frozenorb/apiv3/model/Rank.java @@ -1,14 +1,14 @@ package net.frozenorb.apiv3.model; import com.google.common.collect.ImmutableList; + import com.mongodb.async.SingleResultCallback; import com.mongodb.async.client.MongoCollection; -import fr.javatic.mongo.jacksonCodec.Entity; -import fr.javatic.mongo.jacksonCodec.objectId.Id; -import lombok.Getter; + import net.frozenorb.apiv3.APIv3; import net.frozenorb.apiv3.unsorted.MongoToVoidMongoCallback; import net.frozenorb.apiv3.util.SyncUtils; + import org.bson.Document; import java.util.HashMap; @@ -17,6 +17,10 @@ import java.util.List; import java.util.Map; import java.util.concurrent.TimeUnit; +import fr.javatic.mongo.jacksonCodec.Entity; +import fr.javatic.mongo.jacksonCodec.objectId.Id; +import lombok.Getter; + @Entity public final class Rank { diff --git a/src/main/java/net/frozenorb/apiv3/model/Server.java b/src/main/java/net/frozenorb/apiv3/model/Server.java index 839edbc..336e377 100644 --- a/src/main/java/net/frozenorb/apiv3/model/Server.java +++ b/src/main/java/net/frozenorb/apiv3/model/Server.java @@ -2,22 +2,32 @@ package net.frozenorb.apiv3.model; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; + import com.mongodb.async.SingleResultCallback; import com.mongodb.async.client.MongoCollection; -import fr.javatic.mongo.jacksonCodec.Entity; -import fr.javatic.mongo.jacksonCodec.objectId.Id; -import lombok.Getter; + import net.frozenorb.apiv3.APIv3; import net.frozenorb.apiv3.serialization.gson.ExcludeFromReplies; import net.frozenorb.apiv3.unsorted.MongoToVoidMongoCallback; import net.frozenorb.apiv3.util.SyncUtils; import net.frozenorb.apiv3.util.TimeUtils; + import org.bson.Document; import java.time.Instant; -import java.util.*; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.UUID; import java.util.concurrent.TimeUnit; +import fr.javatic.mongo.jacksonCodec.Entity; +import fr.javatic.mongo.jacksonCodec.objectId.Id; +import lombok.Getter; + @Entity public final class Server { diff --git a/src/main/java/net/frozenorb/apiv3/model/ServerGroup.java b/src/main/java/net/frozenorb/apiv3/model/ServerGroup.java index 6d3b846..7a3d06c 100644 --- a/src/main/java/net/frozenorb/apiv3/model/ServerGroup.java +++ b/src/main/java/net/frozenorb/apiv3/model/ServerGroup.java @@ -2,22 +2,30 @@ package net.frozenorb.apiv3.model; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; + import com.mongodb.async.SingleResultCallback; import com.mongodb.async.client.MongoCollection; -import fr.javatic.mongo.jacksonCodec.Entity; -import fr.javatic.mongo.jacksonCodec.objectId.Id; -import lombok.Getter; -import lombok.Setter; + import net.frozenorb.apiv3.APIv3; import net.frozenorb.apiv3.serialization.gson.ExcludeFromReplies; import net.frozenorb.apiv3.unsorted.MongoToVoidMongoCallback; import net.frozenorb.apiv3.util.PermissionUtils; import net.frozenorb.apiv3.util.SyncUtils; + import org.bson.Document; -import java.util.*; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Set; import java.util.concurrent.TimeUnit; +import fr.javatic.mongo.jacksonCodec.Entity; +import fr.javatic.mongo.jacksonCodec.objectId.Id; +import lombok.Getter; +import lombok.Setter; + @Entity public final class ServerGroup { diff --git a/src/main/java/net/frozenorb/apiv3/model/User.java b/src/main/java/net/frozenorb/apiv3/model/User.java index 9c10528..c3aac6d 100644 --- a/src/main/java/net/frozenorb/apiv3/model/User.java +++ b/src/main/java/net/frozenorb/apiv3/model/User.java @@ -1,7 +1,5 @@ package net.frozenorb.apiv3.model; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.google.common.base.Charsets; import com.google.common.collect.Collections2; import com.google.common.collect.ImmutableList; @@ -9,8 +7,47 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.hash.Hashing; import com.google.common.primitives.Ints; + +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.mongodb.async.SingleResultCallback; import com.mongodb.async.client.MongoCollection; + +import net.frozenorb.apiv3.APIv3; +import net.frozenorb.apiv3.maxmind.MaxMindResult; +import net.frozenorb.apiv3.maxmind.MaxMindUserType; +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.unsorted.MongoToVertxCallback; +import net.frozenorb.apiv3.unsorted.MongoToVoidMongoCallback; +import net.frozenorb.apiv3.unsorted.Permissions; +import net.frozenorb.apiv3.unsorted.RequiresTotpResult; +import net.frozenorb.apiv3.unsorted.TotpAuthorizationResult; +import net.frozenorb.apiv3.util.IpUtils; +import net.frozenorb.apiv3.util.MojangUtils; +import net.frozenorb.apiv3.util.PermissionUtils; +import net.frozenorb.apiv3.util.PhoneUtils; +import net.frozenorb.apiv3.util.SyncUtils; +import net.frozenorb.apiv3.util.TotpUtils; +import net.frozenorb.apiv3.util.UuidUtils; + +import org.bson.Document; + +import java.time.Instant; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Random; +import java.util.Set; +import java.util.UUID; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.TimeUnit; + import fr.javatic.mongo.jacksonCodec.Entity; import fr.javatic.mongo.jacksonCodec.objectId.Id; import io.vertx.core.CompositeFuture; @@ -18,21 +55,6 @@ import io.vertx.core.Future; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.Setter; -import net.frozenorb.apiv3.APIv3; -import net.frozenorb.apiv3.maxmind.MaxMindResult; -import net.frozenorb.apiv3.maxmind.MaxMindUserType; -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.unsorted.*; -import net.frozenorb.apiv3.util.*; -import org.bson.Document; - -import java.time.Instant; -import java.util.*; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; @Entity @AllArgsConstructor diff --git a/src/main/java/net/frozenorb/apiv3/route/GETDumpsType.java b/src/main/java/net/frozenorb/apiv3/route/GETDumpsType.java index 0936078..725b250 100644 --- a/src/main/java/net/frozenorb/apiv3/route/GETDumpsType.java +++ b/src/main/java/net/frozenorb/apiv3/route/GETDumpsType.java @@ -3,19 +3,35 @@ package net.frozenorb.apiv3.route; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; -import io.vertx.core.Handler; -import io.vertx.ext.web.RoutingContext; + import net.frozenorb.apiv3.APIv3; import net.frozenorb.apiv3.actor.Actor; import net.frozenorb.apiv3.actor.ActorType; -import net.frozenorb.apiv3.model.*; +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.util.ErrorUtils; import net.frozenorb.apiv3.util.GeoJsonPoint; import java.text.DecimalFormat; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.UUID; import java.util.concurrent.TimeUnit; +import io.vertx.core.Handler; +import io.vertx.ext.web.RoutingContext; + public final class GETDumpsType implements Handler { private static final DecimalFormat coordinateFormat = new DecimalFormat("#.#####"); diff --git a/src/main/java/net/frozenorb/apiv3/route/GETMetrics.java b/src/main/java/net/frozenorb/apiv3/route/GETMetrics.java index 9ee0821..b97ace3 100644 --- a/src/main/java/net/frozenorb/apiv3/route/GETMetrics.java +++ b/src/main/java/net/frozenorb/apiv3/route/GETMetrics.java @@ -1,11 +1,13 @@ package net.frozenorb.apiv3.route; +import net.frozenorb.apiv3.APIv3; + +import org.bson.Document; + import io.vertx.core.Handler; import io.vertx.core.json.JsonObject; import io.vertx.ext.dropwizard.MetricsService; import io.vertx.ext.web.RoutingContext; -import net.frozenorb.apiv3.APIv3; -import org.bson.Document; public final class GETMetrics implements Handler { diff --git a/src/main/java/net/frozenorb/apiv3/route/GETSearch.java b/src/main/java/net/frozenorb/apiv3/route/GETSearch.java index 06bc9f3..e8bd2ef 100644 --- a/src/main/java/net/frozenorb/apiv3/route/GETSearch.java +++ b/src/main/java/net/frozenorb/apiv3/route/GETSearch.java @@ -1,12 +1,13 @@ package net.frozenorb.apiv3.route; -import io.vertx.core.Handler; -import io.vertx.ext.web.RoutingContext; import net.frozenorb.apiv3.APIv3; import net.frozenorb.apiv3.model.User; import net.frozenorb.apiv3.util.ErrorUtils; import net.frozenorb.apiv3.util.SyncUtils; +import io.vertx.core.Handler; +import io.vertx.ext.web.RoutingContext; + public final class GETSearch implements Handler { public void handle(RoutingContext ctx) { diff --git a/src/main/java/net/frozenorb/apiv3/route/GETWhoAmI.java b/src/main/java/net/frozenorb/apiv3/route/GETWhoAmI.java index 5a054b3..a02a74e 100644 --- a/src/main/java/net/frozenorb/apiv3/route/GETWhoAmI.java +++ b/src/main/java/net/frozenorb/apiv3/route/GETWhoAmI.java @@ -1,11 +1,13 @@ package net.frozenorb.apiv3.route; import com.google.common.collect.ImmutableMap; -import io.vertx.core.Handler; -import io.vertx.ext.web.RoutingContext; + import net.frozenorb.apiv3.APIv3; import net.frozenorb.apiv3.actor.Actor; +import io.vertx.core.Handler; +import io.vertx.ext.web.RoutingContext; + public final class GETWhoAmI implements Handler { public void handle(RoutingContext ctx) { diff --git a/src/main/java/net/frozenorb/apiv3/route/POSTLogout.java b/src/main/java/net/frozenorb/apiv3/route/POSTLogout.java index fc543c5..bd80219 100644 --- a/src/main/java/net/frozenorb/apiv3/route/POSTLogout.java +++ b/src/main/java/net/frozenorb/apiv3/route/POSTLogout.java @@ -1,12 +1,14 @@ package net.frozenorb.apiv3.route; import com.google.common.collect.ImmutableMap; -import io.vertx.core.Handler; -import io.vertx.ext.web.RoutingContext; + import net.frozenorb.apiv3.APIv3; import net.frozenorb.apiv3.util.ErrorUtils; import net.frozenorb.apiv3.util.UserSessionUtils; +import io.vertx.core.Handler; +import io.vertx.ext.web.RoutingContext; + public final class POSTLogout implements Handler { public void handle(RoutingContext ctx) { diff --git a/src/main/java/net/frozenorb/apiv3/route/accessTokens/DELETEAccessTokensId.java b/src/main/java/net/frozenorb/apiv3/route/accessTokens/DELETEAccessTokensId.java index b0a8c65..f4e17e7 100644 --- a/src/main/java/net/frozenorb/apiv3/route/accessTokens/DELETEAccessTokensId.java +++ b/src/main/java/net/frozenorb/apiv3/route/accessTokens/DELETEAccessTokensId.java @@ -1,9 +1,7 @@ package net.frozenorb.apiv3.route.accessTokens; import com.google.common.collect.ImmutableMap; -import io.vertx.core.Handler; -import io.vertx.core.json.JsonObject; -import io.vertx.ext.web.RoutingContext; + import net.frozenorb.apiv3.APIv3; import net.frozenorb.apiv3.auditLog.AuditLog; import net.frozenorb.apiv3.auditLog.AuditLogActionType; @@ -12,6 +10,10 @@ import net.frozenorb.apiv3.util.ErrorUtils; import net.frozenorb.apiv3.util.SyncUtils; import net.frozenorb.apiv3.util.UuidUtils; +import io.vertx.core.Handler; +import io.vertx.core.json.JsonObject; +import io.vertx.ext.web.RoutingContext; + public final class DELETEAccessTokensId implements Handler { public void handle(RoutingContext ctx) { diff --git a/src/main/java/net/frozenorb/apiv3/route/accessTokens/GETAccessTokens.java b/src/main/java/net/frozenorb/apiv3/route/accessTokens/GETAccessTokens.java index 439e377..4b0950b 100644 --- a/src/main/java/net/frozenorb/apiv3/route/accessTokens/GETAccessTokens.java +++ b/src/main/java/net/frozenorb/apiv3/route/accessTokens/GETAccessTokens.java @@ -1,7 +1,5 @@ package net.frozenorb.apiv3.route.accessTokens; -import io.vertx.core.Handler; -import io.vertx.ext.web.RoutingContext; import net.frozenorb.apiv3.APIv3; import net.frozenorb.apiv3.model.AccessToken; import net.frozenorb.apiv3.model.User; @@ -9,6 +7,9 @@ import net.frozenorb.apiv3.unsorted.TotpAuthorizationResult; import net.frozenorb.apiv3.util.ErrorUtils; import net.frozenorb.apiv3.util.SyncUtils; +import io.vertx.core.Handler; +import io.vertx.ext.web.RoutingContext; + public final class GETAccessTokens implements Handler { public void handle(RoutingContext ctx) { diff --git a/src/main/java/net/frozenorb/apiv3/route/accessTokens/GETAccessTokensId.java b/src/main/java/net/frozenorb/apiv3/route/accessTokens/GETAccessTokensId.java index 46a415f..a464878 100644 --- a/src/main/java/net/frozenorb/apiv3/route/accessTokens/GETAccessTokensId.java +++ b/src/main/java/net/frozenorb/apiv3/route/accessTokens/GETAccessTokensId.java @@ -1,11 +1,12 @@ package net.frozenorb.apiv3.route.accessTokens; -import io.vertx.core.Handler; -import io.vertx.ext.web.RoutingContext; import net.frozenorb.apiv3.APIv3; import net.frozenorb.apiv3.model.AccessToken; import net.frozenorb.apiv3.util.ErrorUtils; +import io.vertx.core.Handler; +import io.vertx.ext.web.RoutingContext; + public final class GETAccessTokensId implements Handler { public void handle(RoutingContext ctx) { diff --git a/src/main/java/net/frozenorb/apiv3/route/accessTokens/POSTAccessTokens.java b/src/main/java/net/frozenorb/apiv3/route/accessTokens/POSTAccessTokens.java index 831ea31..aa26edb 100644 --- a/src/main/java/net/frozenorb/apiv3/route/accessTokens/POSTAccessTokens.java +++ b/src/main/java/net/frozenorb/apiv3/route/accessTokens/POSTAccessTokens.java @@ -1,9 +1,7 @@ package net.frozenorb.apiv3.route.accessTokens; import com.google.common.collect.ImmutableMap; -import io.vertx.core.Handler; -import io.vertx.core.json.JsonObject; -import io.vertx.ext.web.RoutingContext; + import net.frozenorb.apiv3.APIv3; import net.frozenorb.apiv3.actor.ActorType; import net.frozenorb.apiv3.auditLog.AuditLog; @@ -16,6 +14,10 @@ import net.frozenorb.apiv3.util.SyncUtils; import java.util.List; +import io.vertx.core.Handler; +import io.vertx.core.json.JsonObject; +import io.vertx.ext.web.RoutingContext; + public final class POSTAccessTokens implements Handler { public void handle(RoutingContext ctx) { diff --git a/src/main/java/net/frozenorb/apiv3/route/auditLog/DELETEAuditLogId.java b/src/main/java/net/frozenorb/apiv3/route/auditLog/DELETEAuditLogId.java index 662be3d..c2f9325 100644 --- a/src/main/java/net/frozenorb/apiv3/route/auditLog/DELETEAuditLogId.java +++ b/src/main/java/net/frozenorb/apiv3/route/auditLog/DELETEAuditLogId.java @@ -1,9 +1,7 @@ package net.frozenorb.apiv3.route.auditLog; import com.google.common.collect.ImmutableMap; -import io.vertx.core.Handler; -import io.vertx.core.json.JsonObject; -import io.vertx.ext.web.RoutingContext; + import net.frozenorb.apiv3.APIv3; import net.frozenorb.apiv3.auditLog.AuditLog; import net.frozenorb.apiv3.auditLog.AuditLogActionType; @@ -12,6 +10,10 @@ import net.frozenorb.apiv3.util.ErrorUtils; import net.frozenorb.apiv3.util.SyncUtils; import net.frozenorb.apiv3.util.UuidUtils; +import io.vertx.core.Handler; +import io.vertx.core.json.JsonObject; +import io.vertx.ext.web.RoutingContext; + public final class DELETEAuditLogId implements Handler { public void handle(RoutingContext ctx) { diff --git a/src/main/java/net/frozenorb/apiv3/route/auditLog/GETAuditLog.java b/src/main/java/net/frozenorb/apiv3/route/auditLog/GETAuditLog.java index 26c9b85..958cebc 100644 --- a/src/main/java/net/frozenorb/apiv3/route/auditLog/GETAuditLog.java +++ b/src/main/java/net/frozenorb/apiv3/route/auditLog/GETAuditLog.java @@ -1,13 +1,15 @@ package net.frozenorb.apiv3.route.auditLog; -import io.vertx.core.Handler; -import io.vertx.ext.web.RoutingContext; import net.frozenorb.apiv3.APIv3; import net.frozenorb.apiv3.model.AuditLogEntry; import net.frozenorb.apiv3.util.ErrorUtils; import net.frozenorb.apiv3.util.UuidUtils; + import org.bson.Document; +import io.vertx.core.Handler; +import io.vertx.ext.web.RoutingContext; + public final class GETAuditLog implements Handler { public void handle(RoutingContext ctx) { diff --git a/src/main/java/net/frozenorb/apiv3/route/auditLog/POSTAuditLog.java b/src/main/java/net/frozenorb/apiv3/route/auditLog/POSTAuditLog.java index 565939d..25e5508 100644 --- a/src/main/java/net/frozenorb/apiv3/route/auditLog/POSTAuditLog.java +++ b/src/main/java/net/frozenorb/apiv3/route/auditLog/POSTAuditLog.java @@ -1,8 +1,5 @@ package net.frozenorb.apiv3.route.auditLog; -import io.vertx.core.Handler; -import io.vertx.core.json.JsonObject; -import io.vertx.ext.web.RoutingContext; import net.frozenorb.apiv3.APIv3; import net.frozenorb.apiv3.auditLog.AuditLog; import net.frozenorb.apiv3.auditLog.AuditLogActionType; @@ -10,6 +7,10 @@ import net.frozenorb.apiv3.model.User; import net.frozenorb.apiv3.util.ErrorUtils; import net.frozenorb.apiv3.util.IpUtils; +import io.vertx.core.Handler; +import io.vertx.core.json.JsonObject; +import io.vertx.ext.web.RoutingContext; + public final class POSTAuditLog implements Handler { public void handle(RoutingContext ctx) { diff --git a/src/main/java/net/frozenorb/apiv3/route/bannedAsns/DELETEBannedAsnsId.java b/src/main/java/net/frozenorb/apiv3/route/bannedAsns/DELETEBannedAsnsId.java index 2cdece5..89ee8b0 100644 --- a/src/main/java/net/frozenorb/apiv3/route/bannedAsns/DELETEBannedAsnsId.java +++ b/src/main/java/net/frozenorb/apiv3/route/bannedAsns/DELETEBannedAsnsId.java @@ -1,9 +1,7 @@ package net.frozenorb.apiv3.route.bannedAsns; import com.google.common.collect.ImmutableMap; -import io.vertx.core.Handler; -import io.vertx.core.json.JsonObject; -import io.vertx.ext.web.RoutingContext; + import net.frozenorb.apiv3.APIv3; import net.frozenorb.apiv3.auditLog.AuditLog; import net.frozenorb.apiv3.auditLog.AuditLogActionType; @@ -12,6 +10,10 @@ import net.frozenorb.apiv3.util.ErrorUtils; import net.frozenorb.apiv3.util.SyncUtils; import net.frozenorb.apiv3.util.UuidUtils; +import io.vertx.core.Handler; +import io.vertx.core.json.JsonObject; +import io.vertx.ext.web.RoutingContext; + public final class DELETEBannedAsnsId implements Handler { public void handle(RoutingContext ctx) { diff --git a/src/main/java/net/frozenorb/apiv3/route/bannedAsns/GETBannedAsns.java b/src/main/java/net/frozenorb/apiv3/route/bannedAsns/GETBannedAsns.java index 6149813..8b0ff82 100644 --- a/src/main/java/net/frozenorb/apiv3/route/bannedAsns/GETBannedAsns.java +++ b/src/main/java/net/frozenorb/apiv3/route/bannedAsns/GETBannedAsns.java @@ -1,9 +1,10 @@ package net.frozenorb.apiv3.route.bannedAsns; +import net.frozenorb.apiv3.APIv3; +import net.frozenorb.apiv3.model.BannedAsn; + import io.vertx.core.Handler; import io.vertx.ext.web.RoutingContext; -import net.frozenorb.apiv3.APIv3; -import net.frozenorb.apiv3.model.BannedAsn; public final class GETBannedAsns implements Handler { diff --git a/src/main/java/net/frozenorb/apiv3/route/bannedAsns/GETBannedAsnsId.java b/src/main/java/net/frozenorb/apiv3/route/bannedAsns/GETBannedAsnsId.java index 08b0bd4..9d763cc 100644 --- a/src/main/java/net/frozenorb/apiv3/route/bannedAsns/GETBannedAsnsId.java +++ b/src/main/java/net/frozenorb/apiv3/route/bannedAsns/GETBannedAsnsId.java @@ -1,9 +1,10 @@ package net.frozenorb.apiv3.route.bannedAsns; +import net.frozenorb.apiv3.APIv3; +import net.frozenorb.apiv3.model.BannedAsn; + import io.vertx.core.Handler; import io.vertx.ext.web.RoutingContext; -import net.frozenorb.apiv3.APIv3; -import net.frozenorb.apiv3.model.BannedAsn; public final class GETBannedAsnsId implements Handler { diff --git a/src/main/java/net/frozenorb/apiv3/route/bannedAsns/POSTBannedAsns.java b/src/main/java/net/frozenorb/apiv3/route/bannedAsns/POSTBannedAsns.java index e24d8e9..32e61ec 100644 --- a/src/main/java/net/frozenorb/apiv3/route/bannedAsns/POSTBannedAsns.java +++ b/src/main/java/net/frozenorb/apiv3/route/bannedAsns/POSTBannedAsns.java @@ -1,9 +1,7 @@ package net.frozenorb.apiv3.route.bannedAsns; import com.google.common.collect.ImmutableMap; -import io.vertx.core.Handler; -import io.vertx.core.json.JsonObject; -import io.vertx.ext.web.RoutingContext; + import net.frozenorb.apiv3.APIv3; import net.frozenorb.apiv3.auditLog.AuditLog; import net.frozenorb.apiv3.auditLog.AuditLogActionType; @@ -12,6 +10,10 @@ import net.frozenorb.apiv3.util.ErrorUtils; import net.frozenorb.apiv3.util.SyncUtils; import net.frozenorb.apiv3.util.UuidUtils; +import io.vertx.core.Handler; +import io.vertx.core.json.JsonObject; +import io.vertx.ext.web.RoutingContext; + public final class POSTBannedAsns implements Handler { public void handle(RoutingContext ctx) { diff --git a/src/main/java/net/frozenorb/apiv3/route/bannedCellCarriers/DELETEBannedCellCarriersId.java b/src/main/java/net/frozenorb/apiv3/route/bannedCellCarriers/DELETEBannedCellCarriersId.java index fcd2771..48c7ae2 100644 --- a/src/main/java/net/frozenorb/apiv3/route/bannedCellCarriers/DELETEBannedCellCarriersId.java +++ b/src/main/java/net/frozenorb/apiv3/route/bannedCellCarriers/DELETEBannedCellCarriersId.java @@ -1,9 +1,7 @@ package net.frozenorb.apiv3.route.bannedCellCarriers; import com.google.common.collect.ImmutableMap; -import io.vertx.core.Handler; -import io.vertx.core.json.JsonObject; -import io.vertx.ext.web.RoutingContext; + import net.frozenorb.apiv3.APIv3; import net.frozenorb.apiv3.auditLog.AuditLog; import net.frozenorb.apiv3.auditLog.AuditLogActionType; @@ -12,6 +10,10 @@ import net.frozenorb.apiv3.util.ErrorUtils; import net.frozenorb.apiv3.util.SyncUtils; import net.frozenorb.apiv3.util.UuidUtils; +import io.vertx.core.Handler; +import io.vertx.core.json.JsonObject; +import io.vertx.ext.web.RoutingContext; + public final class DELETEBannedCellCarriersId implements Handler { public void handle(RoutingContext ctx) { diff --git a/src/main/java/net/frozenorb/apiv3/route/bannedCellCarriers/GETBannedCellCarriers.java b/src/main/java/net/frozenorb/apiv3/route/bannedCellCarriers/GETBannedCellCarriers.java index 5f49e80..08a016f 100644 --- a/src/main/java/net/frozenorb/apiv3/route/bannedCellCarriers/GETBannedCellCarriers.java +++ b/src/main/java/net/frozenorb/apiv3/route/bannedCellCarriers/GETBannedCellCarriers.java @@ -1,9 +1,10 @@ package net.frozenorb.apiv3.route.bannedCellCarriers; +import net.frozenorb.apiv3.APIv3; +import net.frozenorb.apiv3.model.BannedCellCarrier; + import io.vertx.core.Handler; import io.vertx.ext.web.RoutingContext; -import net.frozenorb.apiv3.APIv3; -import net.frozenorb.apiv3.model.BannedCellCarrier; public final class GETBannedCellCarriers implements Handler { diff --git a/src/main/java/net/frozenorb/apiv3/route/bannedCellCarriers/GETBannedCellCarriersId.java b/src/main/java/net/frozenorb/apiv3/route/bannedCellCarriers/GETBannedCellCarriersId.java index b025c40..41ef711 100644 --- a/src/main/java/net/frozenorb/apiv3/route/bannedCellCarriers/GETBannedCellCarriersId.java +++ b/src/main/java/net/frozenorb/apiv3/route/bannedCellCarriers/GETBannedCellCarriersId.java @@ -1,9 +1,10 @@ package net.frozenorb.apiv3.route.bannedCellCarriers; +import net.frozenorb.apiv3.APIv3; +import net.frozenorb.apiv3.model.BannedCellCarrier; + import io.vertx.core.Handler; import io.vertx.ext.web.RoutingContext; -import net.frozenorb.apiv3.APIv3; -import net.frozenorb.apiv3.model.BannedCellCarrier; public final class GETBannedCellCarriersId implements Handler { diff --git a/src/main/java/net/frozenorb/apiv3/route/bannedCellCarriers/POSTBannedCellCarriers.java b/src/main/java/net/frozenorb/apiv3/route/bannedCellCarriers/POSTBannedCellCarriers.java index 13ee20a..6acae45 100644 --- a/src/main/java/net/frozenorb/apiv3/route/bannedCellCarriers/POSTBannedCellCarriers.java +++ b/src/main/java/net/frozenorb/apiv3/route/bannedCellCarriers/POSTBannedCellCarriers.java @@ -1,9 +1,7 @@ package net.frozenorb.apiv3.route.bannedCellCarriers; import com.google.common.collect.ImmutableMap; -import io.vertx.core.Handler; -import io.vertx.core.json.JsonObject; -import io.vertx.ext.web.RoutingContext; + import net.frozenorb.apiv3.APIv3; import net.frozenorb.apiv3.auditLog.AuditLog; import net.frozenorb.apiv3.auditLog.AuditLogActionType; @@ -12,6 +10,10 @@ import net.frozenorb.apiv3.util.ErrorUtils; import net.frozenorb.apiv3.util.SyncUtils; import net.frozenorb.apiv3.util.UuidUtils; +import io.vertx.core.Handler; +import io.vertx.core.json.JsonObject; +import io.vertx.ext.web.RoutingContext; + public final class POSTBannedCellCarriers implements Handler { public void handle(RoutingContext ctx) { diff --git a/src/main/java/net/frozenorb/apiv3/route/chatFilter/DELETEChatFilterId.java b/src/main/java/net/frozenorb/apiv3/route/chatFilter/DELETEChatFilterId.java index b1150eb..b750aec 100644 --- a/src/main/java/net/frozenorb/apiv3/route/chatFilter/DELETEChatFilterId.java +++ b/src/main/java/net/frozenorb/apiv3/route/chatFilter/DELETEChatFilterId.java @@ -1,9 +1,7 @@ package net.frozenorb.apiv3.route.chatFilter; import com.google.common.collect.ImmutableMap; -import io.vertx.core.Handler; -import io.vertx.core.json.JsonObject; -import io.vertx.ext.web.RoutingContext; + import net.frozenorb.apiv3.APIv3; import net.frozenorb.apiv3.auditLog.AuditLog; import net.frozenorb.apiv3.auditLog.AuditLogActionType; @@ -12,6 +10,10 @@ import net.frozenorb.apiv3.util.ErrorUtils; import net.frozenorb.apiv3.util.SyncUtils; import net.frozenorb.apiv3.util.UuidUtils; +import io.vertx.core.Handler; +import io.vertx.core.json.JsonObject; +import io.vertx.ext.web.RoutingContext; + public final class DELETEChatFilterId implements Handler { public void handle(RoutingContext ctx) { diff --git a/src/main/java/net/frozenorb/apiv3/route/chatFilter/GETChatFilter.java b/src/main/java/net/frozenorb/apiv3/route/chatFilter/GETChatFilter.java index 906017a..b2ddeb3 100644 --- a/src/main/java/net/frozenorb/apiv3/route/chatFilter/GETChatFilter.java +++ b/src/main/java/net/frozenorb/apiv3/route/chatFilter/GETChatFilter.java @@ -1,11 +1,12 @@ package net.frozenorb.apiv3.route.chatFilter; -import io.vertx.core.Handler; -import io.vertx.ext.web.RoutingContext; import net.frozenorb.apiv3.APIv3; import net.frozenorb.apiv3.model.ChatFilterEntry; import net.frozenorb.apiv3.util.ErrorUtils; +import io.vertx.core.Handler; +import io.vertx.ext.web.RoutingContext; + public final class GETChatFilter implements Handler { public void handle(RoutingContext ctx) { diff --git a/src/main/java/net/frozenorb/apiv3/route/chatFilter/GETChatFilterId.java b/src/main/java/net/frozenorb/apiv3/route/chatFilter/GETChatFilterId.java index 3613bc8..e658404 100644 --- a/src/main/java/net/frozenorb/apiv3/route/chatFilter/GETChatFilterId.java +++ b/src/main/java/net/frozenorb/apiv3/route/chatFilter/GETChatFilterId.java @@ -1,11 +1,12 @@ package net.frozenorb.apiv3.route.chatFilter; -import io.vertx.core.Handler; -import io.vertx.ext.web.RoutingContext; import net.frozenorb.apiv3.APIv3; import net.frozenorb.apiv3.model.ChatFilterEntry; import net.frozenorb.apiv3.util.ErrorUtils; +import io.vertx.core.Handler; +import io.vertx.ext.web.RoutingContext; + public final class GETChatFilterId implements Handler { public void handle(RoutingContext ctx) { diff --git a/src/main/java/net/frozenorb/apiv3/route/chatFilter/POSTChatFilter.java b/src/main/java/net/frozenorb/apiv3/route/chatFilter/POSTChatFilter.java index af80dff..6022551 100644 --- a/src/main/java/net/frozenorb/apiv3/route/chatFilter/POSTChatFilter.java +++ b/src/main/java/net/frozenorb/apiv3/route/chatFilter/POSTChatFilter.java @@ -1,9 +1,7 @@ package net.frozenorb.apiv3.route.chatFilter; import com.google.common.collect.ImmutableMap; -import io.vertx.core.Handler; -import io.vertx.core.json.JsonObject; -import io.vertx.ext.web.RoutingContext; + import net.frozenorb.apiv3.APIv3; import net.frozenorb.apiv3.auditLog.AuditLog; import net.frozenorb.apiv3.auditLog.AuditLogActionType; @@ -12,6 +10,10 @@ import net.frozenorb.apiv3.util.ErrorUtils; import net.frozenorb.apiv3.util.SyncUtils; import net.frozenorb.apiv3.util.UuidUtils; +import io.vertx.core.Handler; +import io.vertx.core.json.JsonObject; +import io.vertx.ext.web.RoutingContext; + public final class POSTChatFilter implements Handler { public void handle(RoutingContext ctx) { diff --git a/src/main/java/net/frozenorb/apiv3/route/disposableLoginTokens/POSTDisposableLoginTokens.java b/src/main/java/net/frozenorb/apiv3/route/disposableLoginTokens/POSTDisposableLoginTokens.java index 5d6ffe8..f16e45c 100644 --- a/src/main/java/net/frozenorb/apiv3/route/disposableLoginTokens/POSTDisposableLoginTokens.java +++ b/src/main/java/net/frozenorb/apiv3/route/disposableLoginTokens/POSTDisposableLoginTokens.java @@ -1,9 +1,7 @@ package net.frozenorb.apiv3.route.disposableLoginTokens; import com.google.common.collect.ImmutableMap; -import io.vertx.core.Handler; -import io.vertx.core.json.JsonObject; -import io.vertx.ext.web.RoutingContext; + import net.frozenorb.apiv3.APIv3; import net.frozenorb.apiv3.model.User; import net.frozenorb.apiv3.util.DisposableLoginTokenUtils; @@ -11,6 +9,10 @@ import net.frozenorb.apiv3.util.ErrorUtils; import net.frozenorb.apiv3.util.IpUtils; import net.frozenorb.apiv3.util.SyncUtils; +import io.vertx.core.Handler; +import io.vertx.core.json.JsonObject; +import io.vertx.ext.web.RoutingContext; + public final class POSTDisposableLoginTokens implements Handler { public void handle(RoutingContext ctx) { diff --git a/src/main/java/net/frozenorb/apiv3/route/disposableLoginTokens/POSTDisposableLoginTokensIdUse.java b/src/main/java/net/frozenorb/apiv3/route/disposableLoginTokens/POSTDisposableLoginTokensIdUse.java index abcbb90..501a07f 100644 --- a/src/main/java/net/frozenorb/apiv3/route/disposableLoginTokens/POSTDisposableLoginTokensIdUse.java +++ b/src/main/java/net/frozenorb/apiv3/route/disposableLoginTokens/POSTDisposableLoginTokensIdUse.java @@ -1,13 +1,19 @@ package net.frozenorb.apiv3.route.disposableLoginTokens; import com.google.common.collect.ImmutableMap; -import io.vertx.core.Handler; -import io.vertx.core.json.JsonObject; -import io.vertx.ext.web.RoutingContext; + import net.frozenorb.apiv3.APIv3; import net.frozenorb.apiv3.auditLog.AuditLog; import net.frozenorb.apiv3.auditLog.AuditLogActionType; -import net.frozenorb.apiv3.util.*; +import net.frozenorb.apiv3.util.DisposableLoginTokenUtils; +import net.frozenorb.apiv3.util.ErrorUtils; +import net.frozenorb.apiv3.util.IpUtils; +import net.frozenorb.apiv3.util.SyncUtils; +import net.frozenorb.apiv3.util.UserSessionUtils; + +import io.vertx.core.Handler; +import io.vertx.core.json.JsonObject; +import io.vertx.ext.web.RoutingContext; public final class POSTDisposableLoginTokensIdUse implements Handler { diff --git a/src/main/java/net/frozenorb/apiv3/route/emailTokens/GETEmailTokensIdOwner.java b/src/main/java/net/frozenorb/apiv3/route/emailTokens/GETEmailTokensIdOwner.java index 3a36756..df701df 100644 --- a/src/main/java/net/frozenorb/apiv3/route/emailTokens/GETEmailTokensIdOwner.java +++ b/src/main/java/net/frozenorb/apiv3/route/emailTokens/GETEmailTokensIdOwner.java @@ -1,11 +1,12 @@ package net.frozenorb.apiv3.route.emailTokens; -import io.vertx.core.Handler; -import io.vertx.ext.web.RoutingContext; import net.frozenorb.apiv3.APIv3; import net.frozenorb.apiv3.model.User; import net.frozenorb.apiv3.util.ErrorUtils; +import io.vertx.core.Handler; +import io.vertx.ext.web.RoutingContext; + public final class GETEmailTokensIdOwner implements Handler { public void handle(RoutingContext ctx) { diff --git a/src/main/java/net/frozenorb/apiv3/route/emailTokens/POSTEmailTokensIdConfirm.java b/src/main/java/net/frozenorb/apiv3/route/emailTokens/POSTEmailTokensIdConfirm.java index e2653ab..e1d8a62 100644 --- a/src/main/java/net/frozenorb/apiv3/route/emailTokens/POSTEmailTokensIdConfirm.java +++ b/src/main/java/net/frozenorb/apiv3/route/emailTokens/POSTEmailTokensIdConfirm.java @@ -1,9 +1,7 @@ package net.frozenorb.apiv3.route.emailTokens; import com.google.common.collect.ImmutableMap; -import io.vertx.core.Handler; -import io.vertx.core.json.JsonObject; -import io.vertx.ext.web.RoutingContext; + import net.frozenorb.apiv3.APIv3; import net.frozenorb.apiv3.auditLog.AuditLog; import net.frozenorb.apiv3.auditLog.AuditLogActionType; @@ -15,6 +13,10 @@ import net.frozenorb.apiv3.util.SyncUtils; import java.util.concurrent.TimeUnit; +import io.vertx.core.Handler; +import io.vertx.core.json.JsonObject; +import io.vertx.ext.web.RoutingContext; + public final class POSTEmailTokensIdConfirm implements Handler { public void handle(RoutingContext ctx) { diff --git a/src/main/java/net/frozenorb/apiv3/route/grants/DELETEGrantsId.java b/src/main/java/net/frozenorb/apiv3/route/grants/DELETEGrantsId.java index 43c0789..5acc618 100644 --- a/src/main/java/net/frozenorb/apiv3/route/grants/DELETEGrantsId.java +++ b/src/main/java/net/frozenorb/apiv3/route/grants/DELETEGrantsId.java @@ -1,9 +1,7 @@ package net.frozenorb.apiv3.route.grants; import com.google.common.collect.ImmutableMap; -import io.vertx.core.Handler; -import io.vertx.core.json.JsonObject; -import io.vertx.ext.web.RoutingContext; + import net.frozenorb.apiv3.APIv3; import net.frozenorb.apiv3.auditLog.AuditLog; import net.frozenorb.apiv3.auditLog.AuditLogActionType; @@ -13,6 +11,10 @@ import net.frozenorb.apiv3.unsorted.Permissions; import net.frozenorb.apiv3.util.ErrorUtils; import net.frozenorb.apiv3.util.SyncUtils; +import io.vertx.core.Handler; +import io.vertx.core.json.JsonObject; +import io.vertx.ext.web.RoutingContext; + public final class DELETEGrantsId implements Handler { public void handle(RoutingContext ctx) { diff --git a/src/main/java/net/frozenorb/apiv3/route/grants/GETGrants.java b/src/main/java/net/frozenorb/apiv3/route/grants/GETGrants.java index 9492355..8b9bf59 100644 --- a/src/main/java/net/frozenorb/apiv3/route/grants/GETGrants.java +++ b/src/main/java/net/frozenorb/apiv3/route/grants/GETGrants.java @@ -1,15 +1,17 @@ package net.frozenorb.apiv3.route.grants; -import io.vertx.core.Handler; -import io.vertx.ext.web.RoutingContext; import net.frozenorb.apiv3.APIv3; import net.frozenorb.apiv3.model.Grant; import net.frozenorb.apiv3.util.ErrorUtils; import net.frozenorb.apiv3.util.UuidUtils; + import org.bson.Document; import java.util.stream.Collectors; +import io.vertx.core.Handler; +import io.vertx.ext.web.RoutingContext; + public final class GETGrants implements Handler { public void handle(RoutingContext ctx) { diff --git a/src/main/java/net/frozenorb/apiv3/route/grants/GETGrantsId.java b/src/main/java/net/frozenorb/apiv3/route/grants/GETGrantsId.java index 0cff261..bd154b4 100644 --- a/src/main/java/net/frozenorb/apiv3/route/grants/GETGrantsId.java +++ b/src/main/java/net/frozenorb/apiv3/route/grants/GETGrantsId.java @@ -1,11 +1,12 @@ package net.frozenorb.apiv3.route.grants; -import io.vertx.core.Handler; -import io.vertx.ext.web.RoutingContext; import net.frozenorb.apiv3.APIv3; import net.frozenorb.apiv3.model.Grant; import net.frozenorb.apiv3.util.ErrorUtils; +import io.vertx.core.Handler; +import io.vertx.ext.web.RoutingContext; + public final class GETGrantsId implements Handler { public void handle(RoutingContext ctx) { diff --git a/src/main/java/net/frozenorb/apiv3/route/grants/POSTGrants.java b/src/main/java/net/frozenorb/apiv3/route/grants/POSTGrants.java index d67c071..9a41f71 100644 --- a/src/main/java/net/frozenorb/apiv3/route/grants/POSTGrants.java +++ b/src/main/java/net/frozenorb/apiv3/route/grants/POSTGrants.java @@ -1,9 +1,7 @@ package net.frozenorb.apiv3.route.grants; import com.google.common.collect.ImmutableMap; -import io.vertx.core.Handler; -import io.vertx.core.json.JsonObject; -import io.vertx.ext.web.RoutingContext; + import net.frozenorb.apiv3.APIv3; import net.frozenorb.apiv3.auditLog.AuditLog; import net.frozenorb.apiv3.auditLog.AuditLogActionType; @@ -21,6 +19,10 @@ import java.util.HashSet; import java.util.List; import java.util.Set; +import io.vertx.core.Handler; +import io.vertx.core.json.JsonObject; +import io.vertx.ext.web.RoutingContext; + public final class POSTGrants implements Handler { public void handle(RoutingContext ctx) { diff --git a/src/main/java/net/frozenorb/apiv3/route/ipBans/DELETEIpBansId.java b/src/main/java/net/frozenorb/apiv3/route/ipBans/DELETEIpBansId.java index 5ac18cf..2b659bf 100644 --- a/src/main/java/net/frozenorb/apiv3/route/ipBans/DELETEIpBansId.java +++ b/src/main/java/net/frozenorb/apiv3/route/ipBans/DELETEIpBansId.java @@ -1,9 +1,7 @@ package net.frozenorb.apiv3.route.ipBans; import com.google.common.collect.ImmutableMap; -import io.vertx.core.Handler; -import io.vertx.core.json.JsonObject; -import io.vertx.ext.web.RoutingContext; + import net.frozenorb.apiv3.APIv3; import net.frozenorb.apiv3.auditLog.AuditLog; import net.frozenorb.apiv3.auditLog.AuditLogActionType; @@ -12,6 +10,10 @@ import net.frozenorb.apiv3.model.User; import net.frozenorb.apiv3.util.ErrorUtils; import net.frozenorb.apiv3.util.SyncUtils; +import io.vertx.core.Handler; +import io.vertx.core.json.JsonObject; +import io.vertx.ext.web.RoutingContext; + public final class DELETEIpBansId implements Handler { public void handle(RoutingContext ctx) { diff --git a/src/main/java/net/frozenorb/apiv3/route/ipBans/GETIpBans.java b/src/main/java/net/frozenorb/apiv3/route/ipBans/GETIpBans.java index bf74f9c..f6021f8 100644 --- a/src/main/java/net/frozenorb/apiv3/route/ipBans/GETIpBans.java +++ b/src/main/java/net/frozenorb/apiv3/route/ipBans/GETIpBans.java @@ -1,13 +1,15 @@ package net.frozenorb.apiv3.route.ipBans; -import io.vertx.core.Handler; -import io.vertx.ext.web.RoutingContext; import net.frozenorb.apiv3.APIv3; import net.frozenorb.apiv3.model.IpBan; import net.frozenorb.apiv3.util.ErrorUtils; import net.frozenorb.apiv3.util.IpUtils; + import org.bson.Document; +import io.vertx.core.Handler; +import io.vertx.ext.web.RoutingContext; + public final class GETIpBans implements Handler { public void handle(RoutingContext ctx) { diff --git a/src/main/java/net/frozenorb/apiv3/route/ipBans/GETIpBansId.java b/src/main/java/net/frozenorb/apiv3/route/ipBans/GETIpBansId.java index c2c0889..e73a856 100644 --- a/src/main/java/net/frozenorb/apiv3/route/ipBans/GETIpBansId.java +++ b/src/main/java/net/frozenorb/apiv3/route/ipBans/GETIpBansId.java @@ -1,11 +1,12 @@ package net.frozenorb.apiv3.route.ipBans; -import io.vertx.core.Handler; -import io.vertx.ext.web.RoutingContext; import net.frozenorb.apiv3.APIv3; import net.frozenorb.apiv3.model.IpBan; import net.frozenorb.apiv3.util.ErrorUtils; +import io.vertx.core.Handler; +import io.vertx.ext.web.RoutingContext; + public final class GETIpBansId implements Handler { public void handle(RoutingContext ctx) { diff --git a/src/main/java/net/frozenorb/apiv3/route/ipBans/POSTIpBans.java b/src/main/java/net/frozenorb/apiv3/route/ipBans/POSTIpBans.java index 32ab057..b8d5594 100644 --- a/src/main/java/net/frozenorb/apiv3/route/ipBans/POSTIpBans.java +++ b/src/main/java/net/frozenorb/apiv3/route/ipBans/POSTIpBans.java @@ -1,9 +1,7 @@ package net.frozenorb.apiv3.route.ipBans; import com.google.common.collect.ImmutableMap; -import io.vertx.core.Handler; -import io.vertx.core.json.JsonObject; -import io.vertx.ext.web.RoutingContext; + import net.frozenorb.apiv3.APIv3; import net.frozenorb.apiv3.auditLog.AuditLog; import net.frozenorb.apiv3.auditLog.AuditLogActionType; @@ -15,6 +13,10 @@ import net.frozenorb.apiv3.util.SyncUtils; import java.time.Instant; +import io.vertx.core.Handler; +import io.vertx.core.json.JsonObject; +import io.vertx.ext.web.RoutingContext; + public final class POSTIpBans implements Handler { public void handle(RoutingContext ctx) { diff --git a/src/main/java/net/frozenorb/apiv3/route/ipIntel/GETIpInteld.java b/src/main/java/net/frozenorb/apiv3/route/ipIntel/GETIpInteld.java index c8769e4..dead235 100644 --- a/src/main/java/net/frozenorb/apiv3/route/ipIntel/GETIpInteld.java +++ b/src/main/java/net/frozenorb/apiv3/route/ipIntel/GETIpInteld.java @@ -1,12 +1,13 @@ package net.frozenorb.apiv3.route.ipIntel; -import io.vertx.core.Handler; -import io.vertx.ext.web.RoutingContext; import net.frozenorb.apiv3.APIv3; import net.frozenorb.apiv3.model.IpIntel; import net.frozenorb.apiv3.util.ErrorUtils; import net.frozenorb.apiv3.util.IpUtils; +import io.vertx.core.Handler; +import io.vertx.ext.web.RoutingContext; + public final class GETIpInteld implements Handler { public void handle(RoutingContext ctx) { diff --git a/src/main/java/net/frozenorb/apiv3/route/ipLog/GETIpLogId.java b/src/main/java/net/frozenorb/apiv3/route/ipLog/GETIpLogId.java index f925711..3c0ad64 100644 --- a/src/main/java/net/frozenorb/apiv3/route/ipLog/GETIpLogId.java +++ b/src/main/java/net/frozenorb/apiv3/route/ipLog/GETIpLogId.java @@ -1,7 +1,5 @@ package net.frozenorb.apiv3.route.ipLog; -import io.vertx.core.Handler; -import io.vertx.ext.web.RoutingContext; import net.frozenorb.apiv3.APIv3; import net.frozenorb.apiv3.model.IpLogEntry; import net.frozenorb.apiv3.util.ErrorUtils; @@ -9,6 +7,9 @@ import net.frozenorb.apiv3.util.UuidUtils; import java.util.UUID; +import io.vertx.core.Handler; +import io.vertx.ext.web.RoutingContext; + public final class GETIpLogId implements Handler { public void handle(RoutingContext ctx) { diff --git a/src/main/java/net/frozenorb/apiv3/route/lookup/POSTLookupByName.java b/src/main/java/net/frozenorb/apiv3/route/lookup/POSTLookupByName.java index 55204ef..4e35f61 100644 --- a/src/main/java/net/frozenorb/apiv3/route/lookup/POSTLookupByName.java +++ b/src/main/java/net/frozenorb/apiv3/route/lookup/POSTLookupByName.java @@ -3,13 +3,11 @@ package net.frozenorb.apiv3.route.lookup; import com.google.common.collect.ImmutableMap; import com.mongodb.async.client.MongoCollection; -import io.vertx.core.Handler; -import io.vertx.core.json.JsonArray; -import io.vertx.core.json.JsonObject; -import io.vertx.ext.web.RoutingContext; + import net.frozenorb.apiv3.APIv3; import net.frozenorb.apiv3.util.ErrorUtils; import net.frozenorb.apiv3.util.SyncUtils; + import org.bson.Document; import java.util.ArrayList; @@ -17,6 +15,11 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import io.vertx.core.Handler; +import io.vertx.core.json.JsonArray; +import io.vertx.core.json.JsonObject; +import io.vertx.ext.web.RoutingContext; + public class POSTLookupByName implements Handler { private static final MongoCollection usersCollection = APIv3.getDatabase().getCollection("users"); diff --git a/src/main/java/net/frozenorb/apiv3/route/lookup/POSTLookupByUuid.java b/src/main/java/net/frozenorb/apiv3/route/lookup/POSTLookupByUuid.java index f70d4db..da54f0a 100644 --- a/src/main/java/net/frozenorb/apiv3/route/lookup/POSTLookupByUuid.java +++ b/src/main/java/net/frozenorb/apiv3/route/lookup/POSTLookupByUuid.java @@ -1,17 +1,24 @@ package net.frozenorb.apiv3.route.lookup; import com.mongodb.async.client.MongoCollection; -import io.vertx.core.Handler; -import io.vertx.core.json.JsonArray; -import io.vertx.core.json.JsonObject; -import io.vertx.ext.web.RoutingContext; + import net.frozenorb.apiv3.APIv3; import net.frozenorb.apiv3.util.ErrorUtils; import net.frozenorb.apiv3.util.SyncUtils; import net.frozenorb.apiv3.util.UuidUtils; + import org.bson.Document; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.UUID; + +import io.vertx.core.Handler; +import io.vertx.core.json.JsonArray; +import io.vertx.core.json.JsonObject; +import io.vertx.ext.web.RoutingContext; public final class POSTLookupByUuid implements Handler { diff --git a/src/main/java/net/frozenorb/apiv3/route/notificationTemplates/DELETENotificationTemplatesId.java b/src/main/java/net/frozenorb/apiv3/route/notificationTemplates/DELETENotificationTemplatesId.java index 2a538dc..6c41076 100644 --- a/src/main/java/net/frozenorb/apiv3/route/notificationTemplates/DELETENotificationTemplatesId.java +++ b/src/main/java/net/frozenorb/apiv3/route/notificationTemplates/DELETENotificationTemplatesId.java @@ -1,9 +1,7 @@ package net.frozenorb.apiv3.route.notificationTemplates; import com.google.common.collect.ImmutableMap; -import io.vertx.core.Handler; -import io.vertx.core.json.JsonObject; -import io.vertx.ext.web.RoutingContext; + import net.frozenorb.apiv3.APIv3; import net.frozenorb.apiv3.auditLog.AuditLog; import net.frozenorb.apiv3.auditLog.AuditLogActionType; @@ -12,6 +10,10 @@ import net.frozenorb.apiv3.util.ErrorUtils; import net.frozenorb.apiv3.util.SyncUtils; import net.frozenorb.apiv3.util.UuidUtils; +import io.vertx.core.Handler; +import io.vertx.core.json.JsonObject; +import io.vertx.ext.web.RoutingContext; + public final class DELETENotificationTemplatesId implements Handler { public void handle(RoutingContext ctx) { diff --git a/src/main/java/net/frozenorb/apiv3/route/notificationTemplates/GETNotificationTemplates.java b/src/main/java/net/frozenorb/apiv3/route/notificationTemplates/GETNotificationTemplates.java index 978278f..a6b62f4 100644 --- a/src/main/java/net/frozenorb/apiv3/route/notificationTemplates/GETNotificationTemplates.java +++ b/src/main/java/net/frozenorb/apiv3/route/notificationTemplates/GETNotificationTemplates.java @@ -1,11 +1,12 @@ package net.frozenorb.apiv3.route.notificationTemplates; -import io.vertx.core.Handler; -import io.vertx.ext.web.RoutingContext; import net.frozenorb.apiv3.APIv3; import net.frozenorb.apiv3.model.NotificationTemplate; import net.frozenorb.apiv3.util.ErrorUtils; +import io.vertx.core.Handler; +import io.vertx.ext.web.RoutingContext; + public final class GETNotificationTemplates implements Handler { public void handle(RoutingContext ctx) { diff --git a/src/main/java/net/frozenorb/apiv3/route/notificationTemplates/GETNotificationTemplatesId.java b/src/main/java/net/frozenorb/apiv3/route/notificationTemplates/GETNotificationTemplatesId.java index 66084ab..4183919 100644 --- a/src/main/java/net/frozenorb/apiv3/route/notificationTemplates/GETNotificationTemplatesId.java +++ b/src/main/java/net/frozenorb/apiv3/route/notificationTemplates/GETNotificationTemplatesId.java @@ -1,11 +1,12 @@ package net.frozenorb.apiv3.route.notificationTemplates; -import io.vertx.core.Handler; -import io.vertx.ext.web.RoutingContext; import net.frozenorb.apiv3.APIv3; import net.frozenorb.apiv3.model.NotificationTemplate; import net.frozenorb.apiv3.util.ErrorUtils; +import io.vertx.core.Handler; +import io.vertx.ext.web.RoutingContext; + public final class GETNotificationTemplatesId implements Handler { public void handle(RoutingContext ctx) { diff --git a/src/main/java/net/frozenorb/apiv3/route/notificationTemplates/POSTNotificationTemplates.java b/src/main/java/net/frozenorb/apiv3/route/notificationTemplates/POSTNotificationTemplates.java index 2889da6..8074468 100644 --- a/src/main/java/net/frozenorb/apiv3/route/notificationTemplates/POSTNotificationTemplates.java +++ b/src/main/java/net/frozenorb/apiv3/route/notificationTemplates/POSTNotificationTemplates.java @@ -1,9 +1,7 @@ package net.frozenorb.apiv3.route.notificationTemplates; import com.google.common.collect.ImmutableMap; -import io.vertx.core.Handler; -import io.vertx.core.json.JsonObject; -import io.vertx.ext.web.RoutingContext; + import net.frozenorb.apiv3.APIv3; import net.frozenorb.apiv3.auditLog.AuditLog; import net.frozenorb.apiv3.auditLog.AuditLogActionType; @@ -12,6 +10,10 @@ import net.frozenorb.apiv3.util.ErrorUtils; import net.frozenorb.apiv3.util.SyncUtils; import net.frozenorb.apiv3.util.UuidUtils; +import io.vertx.core.Handler; +import io.vertx.core.json.JsonObject; +import io.vertx.ext.web.RoutingContext; + public final class POSTNotificationTemplates implements Handler { public void handle(RoutingContext ctx) { diff --git a/src/main/java/net/frozenorb/apiv3/route/phoneIntel/GETPhoneInteld.java b/src/main/java/net/frozenorb/apiv3/route/phoneIntel/GETPhoneInteld.java index 72ef811..9227d3f 100644 --- a/src/main/java/net/frozenorb/apiv3/route/phoneIntel/GETPhoneInteld.java +++ b/src/main/java/net/frozenorb/apiv3/route/phoneIntel/GETPhoneInteld.java @@ -1,12 +1,13 @@ package net.frozenorb.apiv3.route.phoneIntel; -import io.vertx.core.Handler; -import io.vertx.ext.web.RoutingContext; import net.frozenorb.apiv3.APIv3; import net.frozenorb.apiv3.model.PhoneIntel; import net.frozenorb.apiv3.util.ErrorUtils; import net.frozenorb.apiv3.util.PhoneUtils; +import io.vertx.core.Handler; +import io.vertx.ext.web.RoutingContext; + public final class GETPhoneInteld implements Handler { public void handle(RoutingContext ctx) { diff --git a/src/main/java/net/frozenorb/apiv3/route/punishments/DELETEPunishmentsId.java b/src/main/java/net/frozenorb/apiv3/route/punishments/DELETEPunishmentsId.java index 6ae11db..2e5d1d1 100644 --- a/src/main/java/net/frozenorb/apiv3/route/punishments/DELETEPunishmentsId.java +++ b/src/main/java/net/frozenorb/apiv3/route/punishments/DELETEPunishmentsId.java @@ -1,9 +1,7 @@ package net.frozenorb.apiv3.route.punishments; import com.google.common.collect.ImmutableMap; -import io.vertx.core.Handler; -import io.vertx.core.json.JsonObject; -import io.vertx.ext.web.RoutingContext; + import net.frozenorb.apiv3.APIv3; import net.frozenorb.apiv3.auditLog.AuditLog; import net.frozenorb.apiv3.auditLog.AuditLogActionType; @@ -13,6 +11,10 @@ import net.frozenorb.apiv3.unsorted.Permissions; import net.frozenorb.apiv3.util.ErrorUtils; import net.frozenorb.apiv3.util.SyncUtils; +import io.vertx.core.Handler; +import io.vertx.core.json.JsonObject; +import io.vertx.ext.web.RoutingContext; + public final class DELETEPunishmentsId implements Handler { public void handle(RoutingContext ctx) { diff --git a/src/main/java/net/frozenorb/apiv3/route/punishments/DELETEUsersIdActivePunishment.java b/src/main/java/net/frozenorb/apiv3/route/punishments/DELETEUsersIdActivePunishment.java index fe3fd35..bccd4ba 100644 --- a/src/main/java/net/frozenorb/apiv3/route/punishments/DELETEUsersIdActivePunishment.java +++ b/src/main/java/net/frozenorb/apiv3/route/punishments/DELETEUsersIdActivePunishment.java @@ -2,9 +2,7 @@ package net.frozenorb.apiv3.route.punishments; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; -import io.vertx.core.Handler; -import io.vertx.core.json.JsonObject; -import io.vertx.ext.web.RoutingContext; + import net.frozenorb.apiv3.APIv3; import net.frozenorb.apiv3.auditLog.AuditLog; import net.frozenorb.apiv3.auditLog.AuditLogActionType; @@ -18,6 +16,10 @@ import net.frozenorb.apiv3.util.SyncUtils; import java.util.LinkedList; import java.util.List; +import io.vertx.core.Handler; +import io.vertx.core.json.JsonObject; +import io.vertx.ext.web.RoutingContext; + public final class DELETEUsersIdActivePunishment implements Handler { public void handle(RoutingContext ctx) { diff --git a/src/main/java/net/frozenorb/apiv3/route/punishments/GETPunishments.java b/src/main/java/net/frozenorb/apiv3/route/punishments/GETPunishments.java index fa3e357..d87fec5 100644 --- a/src/main/java/net/frozenorb/apiv3/route/punishments/GETPunishments.java +++ b/src/main/java/net/frozenorb/apiv3/route/punishments/GETPunishments.java @@ -1,16 +1,18 @@ package net.frozenorb.apiv3.route.punishments; -import io.vertx.core.Handler; -import io.vertx.ext.web.RoutingContext; import net.frozenorb.apiv3.APIv3; import net.frozenorb.apiv3.model.Punishment; import net.frozenorb.apiv3.util.ErrorUtils; import net.frozenorb.apiv3.util.UuidUtils; + import org.bson.Document; import java.util.UUID; import java.util.stream.Collectors; +import io.vertx.core.Handler; +import io.vertx.ext.web.RoutingContext; + public final class GETPunishments implements Handler { public void handle(RoutingContext ctx) { diff --git a/src/main/java/net/frozenorb/apiv3/route/punishments/GETPunishmentsId.java b/src/main/java/net/frozenorb/apiv3/route/punishments/GETPunishmentsId.java index b1b212a..add0d94 100644 --- a/src/main/java/net/frozenorb/apiv3/route/punishments/GETPunishmentsId.java +++ b/src/main/java/net/frozenorb/apiv3/route/punishments/GETPunishmentsId.java @@ -1,11 +1,12 @@ package net.frozenorb.apiv3.route.punishments; -import io.vertx.core.Handler; -import io.vertx.ext.web.RoutingContext; import net.frozenorb.apiv3.APIv3; import net.frozenorb.apiv3.model.Punishment; import net.frozenorb.apiv3.util.ErrorUtils; +import io.vertx.core.Handler; +import io.vertx.ext.web.RoutingContext; + public final class GETPunishmentsId implements Handler { public void handle(RoutingContext ctx) { diff --git a/src/main/java/net/frozenorb/apiv3/route/punishments/POSTPunishments.java b/src/main/java/net/frozenorb/apiv3/route/punishments/POSTPunishments.java index d5c3e28..265868a 100644 --- a/src/main/java/net/frozenorb/apiv3/route/punishments/POSTPunishments.java +++ b/src/main/java/net/frozenorb/apiv3/route/punishments/POSTPunishments.java @@ -2,9 +2,7 @@ package net.frozenorb.apiv3.route.punishments; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; -import io.vertx.core.Handler; -import io.vertx.core.json.JsonObject; -import io.vertx.ext.web.RoutingContext; + import net.frozenorb.apiv3.APIv3; import net.frozenorb.apiv3.auditLog.AuditLog; import net.frozenorb.apiv3.auditLog.AuditLogActionType; @@ -21,6 +19,10 @@ import java.time.Instant; import java.util.List; import java.util.Map; +import io.vertx.core.Handler; +import io.vertx.core.json.JsonObject; +import io.vertx.ext.web.RoutingContext; + public final class POSTPunishments implements Handler { public void handle(RoutingContext ctx) { diff --git a/src/main/java/net/frozenorb/apiv3/route/ranks/DELETERanksId.java b/src/main/java/net/frozenorb/apiv3/route/ranks/DELETERanksId.java index d8c87f8..5bc164e 100644 --- a/src/main/java/net/frozenorb/apiv3/route/ranks/DELETERanksId.java +++ b/src/main/java/net/frozenorb/apiv3/route/ranks/DELETERanksId.java @@ -1,9 +1,7 @@ package net.frozenorb.apiv3.route.ranks; import com.google.common.collect.ImmutableMap; -import io.vertx.core.Handler; -import io.vertx.core.json.JsonObject; -import io.vertx.ext.web.RoutingContext; + import net.frozenorb.apiv3.APIv3; import net.frozenorb.apiv3.auditLog.AuditLog; import net.frozenorb.apiv3.auditLog.AuditLogActionType; @@ -12,6 +10,10 @@ import net.frozenorb.apiv3.util.ErrorUtils; import net.frozenorb.apiv3.util.SyncUtils; import net.frozenorb.apiv3.util.UuidUtils; +import io.vertx.core.Handler; +import io.vertx.core.json.JsonObject; +import io.vertx.ext.web.RoutingContext; + public final class DELETERanksId implements Handler { public void handle(RoutingContext ctx) { diff --git a/src/main/java/net/frozenorb/apiv3/route/ranks/GETRanks.java b/src/main/java/net/frozenorb/apiv3/route/ranks/GETRanks.java index c1204b7..2eacb2f 100644 --- a/src/main/java/net/frozenorb/apiv3/route/ranks/GETRanks.java +++ b/src/main/java/net/frozenorb/apiv3/route/ranks/GETRanks.java @@ -1,9 +1,10 @@ package net.frozenorb.apiv3.route.ranks; +import net.frozenorb.apiv3.APIv3; +import net.frozenorb.apiv3.model.Rank; + import io.vertx.core.Handler; import io.vertx.ext.web.RoutingContext; -import net.frozenorb.apiv3.APIv3; -import net.frozenorb.apiv3.model.Rank; public final class GETRanks implements Handler { diff --git a/src/main/java/net/frozenorb/apiv3/route/ranks/GETRanksId.java b/src/main/java/net/frozenorb/apiv3/route/ranks/GETRanksId.java index b66e347..6bac235 100644 --- a/src/main/java/net/frozenorb/apiv3/route/ranks/GETRanksId.java +++ b/src/main/java/net/frozenorb/apiv3/route/ranks/GETRanksId.java @@ -1,9 +1,10 @@ package net.frozenorb.apiv3.route.ranks; +import net.frozenorb.apiv3.APIv3; +import net.frozenorb.apiv3.model.Rank; + import io.vertx.core.Handler; import io.vertx.ext.web.RoutingContext; -import net.frozenorb.apiv3.APIv3; -import net.frozenorb.apiv3.model.Rank; public final class GETRanksId implements Handler { diff --git a/src/main/java/net/frozenorb/apiv3/route/ranks/POSTRanks.java b/src/main/java/net/frozenorb/apiv3/route/ranks/POSTRanks.java index 09f320c..1c0c1ac 100644 --- a/src/main/java/net/frozenorb/apiv3/route/ranks/POSTRanks.java +++ b/src/main/java/net/frozenorb/apiv3/route/ranks/POSTRanks.java @@ -1,9 +1,7 @@ package net.frozenorb.apiv3.route.ranks; import com.google.common.collect.ImmutableMap; -import io.vertx.core.Handler; -import io.vertx.core.json.JsonObject; -import io.vertx.ext.web.RoutingContext; + import net.frozenorb.apiv3.APIv3; import net.frozenorb.apiv3.auditLog.AuditLog; import net.frozenorb.apiv3.auditLog.AuditLogActionType; @@ -12,6 +10,10 @@ import net.frozenorb.apiv3.util.ErrorUtils; import net.frozenorb.apiv3.util.SyncUtils; import net.frozenorb.apiv3.util.UuidUtils; +import io.vertx.core.Handler; +import io.vertx.core.json.JsonObject; +import io.vertx.ext.web.RoutingContext; + public final class POSTRanks implements Handler { public void handle(RoutingContext ctx) { diff --git a/src/main/java/net/frozenorb/apiv3/route/serverGroups/DELETEServerGroupsId.java b/src/main/java/net/frozenorb/apiv3/route/serverGroups/DELETEServerGroupsId.java index 8623c00..02d590c 100644 --- a/src/main/java/net/frozenorb/apiv3/route/serverGroups/DELETEServerGroupsId.java +++ b/src/main/java/net/frozenorb/apiv3/route/serverGroups/DELETEServerGroupsId.java @@ -1,9 +1,7 @@ package net.frozenorb.apiv3.route.serverGroups; import com.google.common.collect.ImmutableMap; -import io.vertx.core.Handler; -import io.vertx.core.json.JsonObject; -import io.vertx.ext.web.RoutingContext; + import net.frozenorb.apiv3.APIv3; import net.frozenorb.apiv3.auditLog.AuditLog; import net.frozenorb.apiv3.auditLog.AuditLogActionType; @@ -12,6 +10,10 @@ import net.frozenorb.apiv3.util.ErrorUtils; import net.frozenorb.apiv3.util.SyncUtils; import net.frozenorb.apiv3.util.UuidUtils; +import io.vertx.core.Handler; +import io.vertx.core.json.JsonObject; +import io.vertx.ext.web.RoutingContext; + public final class DELETEServerGroupsId implements Handler { public void handle(RoutingContext ctx) { diff --git a/src/main/java/net/frozenorb/apiv3/route/serverGroups/GETServerGroups.java b/src/main/java/net/frozenorb/apiv3/route/serverGroups/GETServerGroups.java index bd36ad3..620b028 100644 --- a/src/main/java/net/frozenorb/apiv3/route/serverGroups/GETServerGroups.java +++ b/src/main/java/net/frozenorb/apiv3/route/serverGroups/GETServerGroups.java @@ -1,9 +1,10 @@ package net.frozenorb.apiv3.route.serverGroups; +import net.frozenorb.apiv3.APIv3; +import net.frozenorb.apiv3.model.ServerGroup; + import io.vertx.core.Handler; import io.vertx.ext.web.RoutingContext; -import net.frozenorb.apiv3.APIv3; -import net.frozenorb.apiv3.model.ServerGroup; public final class GETServerGroups implements Handler { diff --git a/src/main/java/net/frozenorb/apiv3/route/serverGroups/GETServerGroupsId.java b/src/main/java/net/frozenorb/apiv3/route/serverGroups/GETServerGroupsId.java index ef23bdc..3fc61a8 100644 --- a/src/main/java/net/frozenorb/apiv3/route/serverGroups/GETServerGroupsId.java +++ b/src/main/java/net/frozenorb/apiv3/route/serverGroups/GETServerGroupsId.java @@ -1,9 +1,10 @@ package net.frozenorb.apiv3.route.serverGroups; +import net.frozenorb.apiv3.APIv3; +import net.frozenorb.apiv3.model.ServerGroup; + import io.vertx.core.Handler; import io.vertx.ext.web.RoutingContext; -import net.frozenorb.apiv3.APIv3; -import net.frozenorb.apiv3.model.ServerGroup; public final class GETServerGroupsId implements Handler { diff --git a/src/main/java/net/frozenorb/apiv3/route/serverGroups/POSTServerGroups.java b/src/main/java/net/frozenorb/apiv3/route/serverGroups/POSTServerGroups.java index 998f53d..3ea9dac 100644 --- a/src/main/java/net/frozenorb/apiv3/route/serverGroups/POSTServerGroups.java +++ b/src/main/java/net/frozenorb/apiv3/route/serverGroups/POSTServerGroups.java @@ -1,9 +1,7 @@ package net.frozenorb.apiv3.route.serverGroups; import com.google.common.collect.ImmutableMap; -import io.vertx.core.Handler; -import io.vertx.core.json.JsonObject; -import io.vertx.ext.web.RoutingContext; + import net.frozenorb.apiv3.APIv3; import net.frozenorb.apiv3.auditLog.AuditLog; import net.frozenorb.apiv3.auditLog.AuditLogActionType; @@ -12,6 +10,10 @@ import net.frozenorb.apiv3.util.ErrorUtils; import net.frozenorb.apiv3.util.SyncUtils; import net.frozenorb.apiv3.util.UuidUtils; +import io.vertx.core.Handler; +import io.vertx.core.json.JsonObject; +import io.vertx.ext.web.RoutingContext; + public final class POSTServerGroups implements Handler { public void handle(RoutingContext ctx) { diff --git a/src/main/java/net/frozenorb/apiv3/route/servers/DELETEServersId.java b/src/main/java/net/frozenorb/apiv3/route/servers/DELETEServersId.java index 70e36ef..c1e880d 100644 --- a/src/main/java/net/frozenorb/apiv3/route/servers/DELETEServersId.java +++ b/src/main/java/net/frozenorb/apiv3/route/servers/DELETEServersId.java @@ -1,9 +1,7 @@ package net.frozenorb.apiv3.route.servers; import com.google.common.collect.ImmutableMap; -import io.vertx.core.Handler; -import io.vertx.core.json.JsonObject; -import io.vertx.ext.web.RoutingContext; + import net.frozenorb.apiv3.APIv3; import net.frozenorb.apiv3.actor.ActorType; import net.frozenorb.apiv3.auditLog.AuditLog; @@ -14,6 +12,10 @@ import net.frozenorb.apiv3.util.ErrorUtils; import net.frozenorb.apiv3.util.SyncUtils; import net.frozenorb.apiv3.util.UuidUtils; +import io.vertx.core.Handler; +import io.vertx.core.json.JsonObject; +import io.vertx.ext.web.RoutingContext; + public final class DELETEServersId implements Handler { public void handle(RoutingContext ctx) { diff --git a/src/main/java/net/frozenorb/apiv3/route/servers/GETServers.java b/src/main/java/net/frozenorb/apiv3/route/servers/GETServers.java index df20de0..4fd2c20 100644 --- a/src/main/java/net/frozenorb/apiv3/route/servers/GETServers.java +++ b/src/main/java/net/frozenorb/apiv3/route/servers/GETServers.java @@ -1,9 +1,10 @@ package net.frozenorb.apiv3.route.servers; +import net.frozenorb.apiv3.APIv3; +import net.frozenorb.apiv3.model.Server; + import io.vertx.core.Handler; import io.vertx.ext.web.RoutingContext; -import net.frozenorb.apiv3.APIv3; -import net.frozenorb.apiv3.model.Server; public final class GETServers implements Handler { diff --git a/src/main/java/net/frozenorb/apiv3/route/servers/GETServersId.java b/src/main/java/net/frozenorb/apiv3/route/servers/GETServersId.java index 5b11f89..e5ba750 100644 --- a/src/main/java/net/frozenorb/apiv3/route/servers/GETServersId.java +++ b/src/main/java/net/frozenorb/apiv3/route/servers/GETServersId.java @@ -1,9 +1,10 @@ package net.frozenorb.apiv3.route.servers; +import net.frozenorb.apiv3.APIv3; +import net.frozenorb.apiv3.model.Server; + import io.vertx.core.Handler; import io.vertx.ext.web.RoutingContext; -import net.frozenorb.apiv3.APIv3; -import net.frozenorb.apiv3.model.Server; public final class GETServersId implements Handler { diff --git a/src/main/java/net/frozenorb/apiv3/route/servers/POSTServers.java b/src/main/java/net/frozenorb/apiv3/route/servers/POSTServers.java index df60094..c129dd6 100644 --- a/src/main/java/net/frozenorb/apiv3/route/servers/POSTServers.java +++ b/src/main/java/net/frozenorb/apiv3/route/servers/POSTServers.java @@ -1,9 +1,7 @@ package net.frozenorb.apiv3.route.servers; import com.google.common.collect.ImmutableMap; -import io.vertx.core.Handler; -import io.vertx.core.json.JsonObject; -import io.vertx.ext.web.RoutingContext; + import net.frozenorb.apiv3.APIv3; import net.frozenorb.apiv3.auditLog.AuditLog; import net.frozenorb.apiv3.auditLog.AuditLogActionType; @@ -15,6 +13,10 @@ import net.frozenorb.apiv3.util.IpUtils; import net.frozenorb.apiv3.util.SyncUtils; import net.frozenorb.apiv3.util.UuidUtils; +import io.vertx.core.Handler; +import io.vertx.core.json.JsonObject; +import io.vertx.ext.web.RoutingContext; + public final class POSTServers implements Handler { public void handle(RoutingContext ctx) { diff --git a/src/main/java/net/frozenorb/apiv3/route/servers/POSTServersHeartbeat.java b/src/main/java/net/frozenorb/apiv3/route/servers/POSTServersHeartbeat.java index 07bc060..1db5fe6 100644 --- a/src/main/java/net/frozenorb/apiv3/route/servers/POSTServersHeartbeat.java +++ b/src/main/java/net/frozenorb/apiv3/route/servers/POSTServersHeartbeat.java @@ -2,6 +2,29 @@ package net.frozenorb.apiv3.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.MongoToVertxCallback; +import net.frozenorb.apiv3.util.ErrorUtils; +import net.frozenorb.apiv3.util.IpUtils; +import net.frozenorb.apiv3.util.PermissionUtils; +import net.frozenorb.apiv3.util.UuidUtils; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.UUID; + import io.vertx.core.CompositeFuture; import io.vertx.core.Future; import io.vertx.core.Handler; @@ -9,17 +32,6 @@ import io.vertx.core.json.JsonArray; import io.vertx.core.json.JsonObject; import io.vertx.ext.web.RoutingContext; import lombok.extern.slf4j.Slf4j; -import net.frozenorb.apiv3.APIv3; -import net.frozenorb.apiv3.actor.Actor; -import net.frozenorb.apiv3.actor.ActorType; -import net.frozenorb.apiv3.model.*; -import net.frozenorb.apiv3.unsorted.MongoToVertxCallback; -import net.frozenorb.apiv3.util.ErrorUtils; -import net.frozenorb.apiv3.util.IpUtils; -import net.frozenorb.apiv3.util.PermissionUtils; -import net.frozenorb.apiv3.util.UuidUtils; - -import java.util.*; @Slf4j public final class POSTServersHeartbeat implements Handler { diff --git a/src/main/java/net/frozenorb/apiv3/route/users/GETStaff.java b/src/main/java/net/frozenorb/apiv3/route/users/GETStaff.java index 7b739d9..f1b35f5 100644 --- a/src/main/java/net/frozenorb/apiv3/route/users/GETStaff.java +++ b/src/main/java/net/frozenorb/apiv3/route/users/GETStaff.java @@ -1,14 +1,19 @@ package net.frozenorb.apiv3.route.users; -import io.vertx.core.Handler; -import io.vertx.ext.web.RoutingContext; 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.util.SyncUtils; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.TreeMap; + +import io.vertx.core.Handler; +import io.vertx.ext.web.RoutingContext; public final class GETStaff implements Handler { diff --git a/src/main/java/net/frozenorb/apiv3/route/users/GETUsersId.java b/src/main/java/net/frozenorb/apiv3/route/users/GETUsersId.java index 136f4ad..c81a1b0 100644 --- a/src/main/java/net/frozenorb/apiv3/route/users/GETUsersId.java +++ b/src/main/java/net/frozenorb/apiv3/route/users/GETUsersId.java @@ -1,11 +1,12 @@ package net.frozenorb.apiv3.route.users; -import io.vertx.core.Handler; -import io.vertx.ext.web.RoutingContext; import net.frozenorb.apiv3.APIv3; import net.frozenorb.apiv3.model.User; import net.frozenorb.apiv3.util.ErrorUtils; +import io.vertx.core.Handler; +import io.vertx.ext.web.RoutingContext; + public final class GETUsersId implements Handler { public void handle(RoutingContext ctx) { diff --git a/src/main/java/net/frozenorb/apiv3/route/users/GETUsersIdCompoundedPermissions.java b/src/main/java/net/frozenorb/apiv3/route/users/GETUsersIdCompoundedPermissions.java index 62b9075..0db75c5 100644 --- a/src/main/java/net/frozenorb/apiv3/route/users/GETUsersIdCompoundedPermissions.java +++ b/src/main/java/net/frozenorb/apiv3/route/users/GETUsersIdCompoundedPermissions.java @@ -1,12 +1,13 @@ package net.frozenorb.apiv3.route.users; -import io.vertx.core.Handler; -import io.vertx.ext.web.RoutingContext; import net.frozenorb.apiv3.APIv3; import net.frozenorb.apiv3.model.User; import net.frozenorb.apiv3.util.ErrorUtils; import net.frozenorb.apiv3.util.PermissionUtils; +import io.vertx.core.Handler; +import io.vertx.ext.web.RoutingContext; + public final class GETUsersIdCompoundedPermissions implements Handler { public void handle(RoutingContext ctx) { diff --git a/src/main/java/net/frozenorb/apiv3/route/users/GETUsersIdDetails.java b/src/main/java/net/frozenorb/apiv3/route/users/GETUsersIdDetails.java index cfaadd4..5c6ebcf 100644 --- a/src/main/java/net/frozenorb/apiv3/route/users/GETUsersIdDetails.java +++ b/src/main/java/net/frozenorb/apiv3/route/users/GETUsersIdDetails.java @@ -1,7 +1,5 @@ package net.frozenorb.apiv3.route.users; -import io.vertx.core.Handler; -import io.vertx.ext.web.RoutingContext; import net.frozenorb.apiv3.APIv3; import net.frozenorb.apiv3.model.Grant; import net.frozenorb.apiv3.model.IpLogEntry; @@ -14,6 +12,9 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import io.vertx.core.Handler; +import io.vertx.ext.web.RoutingContext; + public final class GETUsersIdDetails implements Handler { public void handle(RoutingContext ctx) { diff --git a/src/main/java/net/frozenorb/apiv3/route/users/GETUsersIdRequiresTotp.java b/src/main/java/net/frozenorb/apiv3/route/users/GETUsersIdRequiresTotp.java index cde0ace..f1bc16f 100644 --- a/src/main/java/net/frozenorb/apiv3/route/users/GETUsersIdRequiresTotp.java +++ b/src/main/java/net/frozenorb/apiv3/route/users/GETUsersIdRequiresTotp.java @@ -1,14 +1,16 @@ package net.frozenorb.apiv3.route.users; import com.google.common.collect.ImmutableMap; -import io.vertx.core.Handler; -import io.vertx.ext.web.RoutingContext; + import net.frozenorb.apiv3.APIv3; import net.frozenorb.apiv3.model.User; import net.frozenorb.apiv3.unsorted.RequiresTotpResult; import net.frozenorb.apiv3.util.ErrorUtils; import net.frozenorb.apiv3.util.IpUtils; +import io.vertx.core.Handler; +import io.vertx.ext.web.RoutingContext; + public final class GETUsersIdRequiresTotp implements Handler { public void handle(RoutingContext ctx) { diff --git a/src/main/java/net/frozenorb/apiv3/route/users/GETUsersIdVerifyPassword.java b/src/main/java/net/frozenorb/apiv3/route/users/GETUsersIdVerifyPassword.java index 5669101..6d64fce 100644 --- a/src/main/java/net/frozenorb/apiv3/route/users/GETUsersIdVerifyPassword.java +++ b/src/main/java/net/frozenorb/apiv3/route/users/GETUsersIdVerifyPassword.java @@ -1,8 +1,7 @@ package net.frozenorb.apiv3.route.users; import com.mongodb.async.SingleResultCallback; -import io.vertx.core.Handler; -import io.vertx.ext.web.RoutingContext; + import net.frozenorb.apiv3.APIv3; import net.frozenorb.apiv3.auditLog.AuditLog; import net.frozenorb.apiv3.auditLog.AuditLogActionType; @@ -16,6 +15,9 @@ import java.util.HashMap; import java.util.Map; import java.util.UUID; +import io.vertx.core.Handler; +import io.vertx.ext.web.RoutingContext; + public final class GETUsersIdVerifyPassword implements Handler { public void handle(RoutingContext ctx) { diff --git a/src/main/java/net/frozenorb/apiv3/route/users/POSTUsersIdChangePassword.java b/src/main/java/net/frozenorb/apiv3/route/users/POSTUsersIdChangePassword.java index d8f3663..74ac2fa 100644 --- a/src/main/java/net/frozenorb/apiv3/route/users/POSTUsersIdChangePassword.java +++ b/src/main/java/net/frozenorb/apiv3/route/users/POSTUsersIdChangePassword.java @@ -1,16 +1,22 @@ package net.frozenorb.apiv3.route.users; import com.google.common.collect.ImmutableMap; -import io.vertx.core.Handler; -import io.vertx.core.json.JsonObject; -import io.vertx.ext.web.RoutingContext; + 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.unsorted.RequiresTotpResult; import net.frozenorb.apiv3.unsorted.TotpAuthorizationResult; -import net.frozenorb.apiv3.util.*; +import net.frozenorb.apiv3.util.ErrorUtils; +import net.frozenorb.apiv3.util.IpUtils; +import net.frozenorb.apiv3.util.PasswordUtils; +import net.frozenorb.apiv3.util.SyncUtils; +import net.frozenorb.apiv3.util.UserSessionUtils; + +import io.vertx.core.Handler; +import io.vertx.core.json.JsonObject; +import io.vertx.ext.web.RoutingContext; public final class POSTUsersIdChangePassword implements Handler { diff --git a/src/main/java/net/frozenorb/apiv3/route/users/POSTUsersIdConfirmPhone.java b/src/main/java/net/frozenorb/apiv3/route/users/POSTUsersIdConfirmPhone.java index fa76325..2582e81 100644 --- a/src/main/java/net/frozenorb/apiv3/route/users/POSTUsersIdConfirmPhone.java +++ b/src/main/java/net/frozenorb/apiv3/route/users/POSTUsersIdConfirmPhone.java @@ -1,9 +1,7 @@ package net.frozenorb.apiv3.route.users; import com.google.common.collect.ImmutableMap; -import io.vertx.core.Handler; -import io.vertx.core.json.JsonObject; -import io.vertx.ext.web.RoutingContext; + import net.frozenorb.apiv3.APIv3; import net.frozenorb.apiv3.auditLog.AuditLog; import net.frozenorb.apiv3.auditLog.AuditLogActionType; @@ -14,6 +12,10 @@ import net.frozenorb.apiv3.util.SyncUtils; import java.util.concurrent.TimeUnit; +import io.vertx.core.Handler; +import io.vertx.core.json.JsonObject; +import io.vertx.ext.web.RoutingContext; + public final class POSTUsersIdConfirmPhone implements Handler { public void handle(RoutingContext ctx) { diff --git a/src/main/java/net/frozenorb/apiv3/route/users/POSTUsersIdLogin.java b/src/main/java/net/frozenorb/apiv3/route/users/POSTUsersIdLogin.java index 3d8bcfd..d738a43 100644 --- a/src/main/java/net/frozenorb/apiv3/route/users/POSTUsersIdLogin.java +++ b/src/main/java/net/frozenorb/apiv3/route/users/POSTUsersIdLogin.java @@ -1,10 +1,9 @@ package net.frozenorb.apiv3.route.users; import com.google.common.collect.ImmutableMap; + import com.mongodb.async.SingleResultCallback; -import io.vertx.core.Handler; -import io.vertx.core.json.JsonObject; -import io.vertx.ext.web.RoutingContext; + import net.frozenorb.apiv3.APIv3; import net.frozenorb.apiv3.actor.Actor; import net.frozenorb.apiv3.actor.ActorType; @@ -17,6 +16,10 @@ import net.frozenorb.apiv3.util.UuidUtils; import java.util.UUID; +import io.vertx.core.Handler; +import io.vertx.core.json.JsonObject; +import io.vertx.ext.web.RoutingContext; + public final class POSTUsersIdLogin implements Handler { public void handle(RoutingContext ctx) { diff --git a/src/main/java/net/frozenorb/apiv3/route/users/POSTUsersIdNotify.java b/src/main/java/net/frozenorb/apiv3/route/users/POSTUsersIdNotify.java index 7a95425..be9b960 100644 --- a/src/main/java/net/frozenorb/apiv3/route/users/POSTUsersIdNotify.java +++ b/src/main/java/net/frozenorb/apiv3/route/users/POSTUsersIdNotify.java @@ -1,9 +1,7 @@ package net.frozenorb.apiv3.route.users; import com.google.common.collect.ImmutableMap; -import io.vertx.core.Handler; -import io.vertx.core.json.JsonObject; -import io.vertx.ext.web.RoutingContext; + import net.frozenorb.apiv3.APIv3; import net.frozenorb.apiv3.model.NotificationTemplate; import net.frozenorb.apiv3.model.User; @@ -13,6 +11,10 @@ import net.frozenorb.apiv3.util.SyncUtils; import java.util.Map; +import io.vertx.core.Handler; +import io.vertx.core.json.JsonObject; +import io.vertx.ext.web.RoutingContext; + public final class POSTUsersIdNotify implements Handler { public void handle(RoutingContext ctx) { diff --git a/src/main/java/net/frozenorb/apiv3/route/users/POSTUsersIdPasswordReset.java b/src/main/java/net/frozenorb/apiv3/route/users/POSTUsersIdPasswordReset.java index 9b52c0d..645ae8a 100644 --- a/src/main/java/net/frozenorb/apiv3/route/users/POSTUsersIdPasswordReset.java +++ b/src/main/java/net/frozenorb/apiv3/route/users/POSTUsersIdPasswordReset.java @@ -1,9 +1,7 @@ package net.frozenorb.apiv3.route.users; import com.google.common.collect.ImmutableMap; -import io.vertx.core.Handler; -import io.vertx.core.json.JsonObject; -import io.vertx.ext.web.RoutingContext; + import net.frozenorb.apiv3.APIv3; import net.frozenorb.apiv3.auditLog.AuditLog; import net.frozenorb.apiv3.auditLog.AuditLogActionType; @@ -17,6 +15,10 @@ import net.frozenorb.apiv3.util.SyncUtils; import java.util.Map; import java.util.concurrent.TimeUnit; +import io.vertx.core.Handler; +import io.vertx.core.json.JsonObject; +import io.vertx.ext.web.RoutingContext; + public final class POSTUsersIdPasswordReset implements Handler { public void handle(RoutingContext ctx) { diff --git a/src/main/java/net/frozenorb/apiv3/route/users/POSTUsersIdRegisterEmail.java b/src/main/java/net/frozenorb/apiv3/route/users/POSTUsersIdRegisterEmail.java index 1462df1..695f645 100644 --- a/src/main/java/net/frozenorb/apiv3/route/users/POSTUsersIdRegisterEmail.java +++ b/src/main/java/net/frozenorb/apiv3/route/users/POSTUsersIdRegisterEmail.java @@ -1,9 +1,7 @@ package net.frozenorb.apiv3.route.users; import com.google.common.collect.ImmutableMap; -import io.vertx.core.Handler; -import io.vertx.core.json.JsonObject; -import io.vertx.ext.web.RoutingContext; + import net.frozenorb.apiv3.APIv3; import net.frozenorb.apiv3.auditLog.AuditLog; import net.frozenorb.apiv3.auditLog.AuditLogActionType; @@ -18,6 +16,10 @@ import net.frozenorb.apiv3.util.SyncUtils; import java.util.Map; import java.util.concurrent.TimeUnit; +import io.vertx.core.Handler; +import io.vertx.core.json.JsonObject; +import io.vertx.ext.web.RoutingContext; + public final class POSTUsersIdRegisterEmail implements Handler { public void handle(RoutingContext ctx) { diff --git a/src/main/java/net/frozenorb/apiv3/route/users/POSTUsersIdRegisterPhone.java b/src/main/java/net/frozenorb/apiv3/route/users/POSTUsersIdRegisterPhone.java index 347f468..2e8269c 100644 --- a/src/main/java/net/frozenorb/apiv3/route/users/POSTUsersIdRegisterPhone.java +++ b/src/main/java/net/frozenorb/apiv3/route/users/POSTUsersIdRegisterPhone.java @@ -1,9 +1,7 @@ package net.frozenorb.apiv3.route.users; import com.google.common.collect.ImmutableMap; -import io.vertx.core.Handler; -import io.vertx.core.json.JsonObject; -import io.vertx.ext.web.RoutingContext; + import net.frozenorb.apiv3.APIv3; import net.frozenorb.apiv3.auditLog.AuditLog; import net.frozenorb.apiv3.auditLog.AuditLogActionType; @@ -20,6 +18,10 @@ import net.frozenorb.apiv3.util.SyncUtils; import java.util.Map; import java.util.concurrent.TimeUnit; +import io.vertx.core.Handler; +import io.vertx.core.json.JsonObject; +import io.vertx.ext.web.RoutingContext; + public final class POSTUsersIdRegisterPhone implements Handler { public void handle(RoutingContext ctx) { diff --git a/src/main/java/net/frozenorb/apiv3/route/users/POSTUsersIdSetupTotp.java b/src/main/java/net/frozenorb/apiv3/route/users/POSTUsersIdSetupTotp.java index 3c58b31..284af8f 100644 --- a/src/main/java/net/frozenorb/apiv3/route/users/POSTUsersIdSetupTotp.java +++ b/src/main/java/net/frozenorb/apiv3/route/users/POSTUsersIdSetupTotp.java @@ -1,9 +1,7 @@ package net.frozenorb.apiv3.route.users; import com.google.common.collect.ImmutableMap; -import io.vertx.core.Handler; -import io.vertx.core.json.JsonObject; -import io.vertx.ext.web.RoutingContext; + import net.frozenorb.apiv3.APIv3; import net.frozenorb.apiv3.auditLog.AuditLog; import net.frozenorb.apiv3.auditLog.AuditLogActionType; @@ -13,6 +11,10 @@ import net.frozenorb.apiv3.util.IpUtils; import net.frozenorb.apiv3.util.SyncUtils; import net.frozenorb.apiv3.util.TotpUtils; +import io.vertx.core.Handler; +import io.vertx.core.json.JsonObject; +import io.vertx.ext.web.RoutingContext; + public final class POSTUsersIdSetupTotp implements Handler { public void handle(RoutingContext ctx) { diff --git a/src/main/java/net/frozenorb/apiv3/route/users/POSTUsersIdVerifyTotp.java b/src/main/java/net/frozenorb/apiv3/route/users/POSTUsersIdVerifyTotp.java index 1f4f4c3..5161800 100644 --- a/src/main/java/net/frozenorb/apiv3/route/users/POSTUsersIdVerifyTotp.java +++ b/src/main/java/net/frozenorb/apiv3/route/users/POSTUsersIdVerifyTotp.java @@ -1,9 +1,7 @@ package net.frozenorb.apiv3.route.users; import com.google.common.collect.ImmutableMap; -import io.vertx.core.Handler; -import io.vertx.core.json.JsonObject; -import io.vertx.ext.web.RoutingContext; + import net.frozenorb.apiv3.APIv3; import net.frozenorb.apiv3.auditLog.AuditLog; import net.frozenorb.apiv3.auditLog.AuditLogActionType; @@ -11,6 +9,10 @@ import net.frozenorb.apiv3.model.User; import net.frozenorb.apiv3.util.ErrorUtils; import net.frozenorb.apiv3.util.IpUtils; +import io.vertx.core.Handler; +import io.vertx.core.json.JsonObject; +import io.vertx.ext.web.RoutingContext; + public final class POSTUsersIdVerifyTotp implements Handler { public void handle(RoutingContext ctx) { diff --git a/src/main/java/net/frozenorb/apiv3/route/users/POSTUsersUsePasswordResetToken.java b/src/main/java/net/frozenorb/apiv3/route/users/POSTUsersUsePasswordResetToken.java index 134104d..8a7a6bb 100644 --- a/src/main/java/net/frozenorb/apiv3/route/users/POSTUsersUsePasswordResetToken.java +++ b/src/main/java/net/frozenorb/apiv3/route/users/POSTUsersUsePasswordResetToken.java @@ -1,17 +1,23 @@ package net.frozenorb.apiv3.route.users; import com.google.common.collect.ImmutableMap; -import io.vertx.core.Handler; -import io.vertx.core.json.JsonObject; -import io.vertx.ext.web.RoutingContext; + 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.util.*; +import net.frozenorb.apiv3.util.ErrorUtils; +import net.frozenorb.apiv3.util.IpUtils; +import net.frozenorb.apiv3.util.PasswordUtils; +import net.frozenorb.apiv3.util.SyncUtils; +import net.frozenorb.apiv3.util.UserSessionUtils; import java.util.concurrent.TimeUnit; +import io.vertx.core.Handler; +import io.vertx.core.json.JsonObject; +import io.vertx.ext.web.RoutingContext; + public final class POSTUsersUsePasswordResetToken implements Handler { public void handle(RoutingContext ctx) { diff --git a/src/main/java/net/frozenorb/apiv3/unsorted/MongoToVertxCallback.java b/src/main/java/net/frozenorb/apiv3/unsorted/MongoToVertxCallback.java index b1f1b69..7088da0 100644 --- a/src/main/java/net/frozenorb/apiv3/unsorted/MongoToVertxCallback.java +++ b/src/main/java/net/frozenorb/apiv3/unsorted/MongoToVertxCallback.java @@ -1,6 +1,7 @@ package net.frozenorb.apiv3.unsorted; import com.mongodb.async.SingleResultCallback; + import io.vertx.core.Future; public final class MongoToVertxCallback implements SingleResultCallback { diff --git a/src/main/java/net/frozenorb/apiv3/unsorted/Notification.java b/src/main/java/net/frozenorb/apiv3/unsorted/Notification.java index 3118e56..241314c 100644 --- a/src/main/java/net/frozenorb/apiv3/unsorted/Notification.java +++ b/src/main/java/net/frozenorb/apiv3/unsorted/Notification.java @@ -1,14 +1,16 @@ package net.frozenorb.apiv3.unsorted; import com.mongodb.async.SingleResultCallback; -import io.vertx.core.json.JsonArray; -import io.vertx.core.json.JsonObject; + import net.frozenorb.apiv3.model.NotificationTemplate; import net.frozenorb.apiv3.util.MandrillUtils; import net.frozenorb.apiv3.util.ZangUtils; import java.util.Map; +import io.vertx.core.json.JsonArray; +import io.vertx.core.json.JsonObject; + public final class Notification { private final String subject; diff --git a/src/main/java/net/frozenorb/apiv3/util/DisposableLoginTokenUtils.java b/src/main/java/net/frozenorb/apiv3/util/DisposableLoginTokenUtils.java index ea2de2a..b5005c1 100644 --- a/src/main/java/net/frozenorb/apiv3/util/DisposableLoginTokenUtils.java +++ b/src/main/java/net/frozenorb/apiv3/util/DisposableLoginTokenUtils.java @@ -1,15 +1,17 @@ package net.frozenorb.apiv3.util; import com.mongodb.async.SingleResultCallback; -import io.vertx.redis.RedisClient; -import io.vertx.redis.RedisOptions; -import lombok.experimental.UtilityClass; + import net.frozenorb.apiv3.APIv3; import net.frozenorb.apiv3.model.User; import java.util.UUID; import java.util.concurrent.TimeUnit; +import io.vertx.redis.RedisClient; +import io.vertx.redis.RedisOptions; +import lombok.experimental.UtilityClass; + @UtilityClass public class DisposableLoginTokenUtils { diff --git a/src/main/java/net/frozenorb/apiv3/util/EmailUtils.java b/src/main/java/net/frozenorb/apiv3/util/EmailUtils.java index 940c828..8ce8449 100644 --- a/src/main/java/net/frozenorb/apiv3/util/EmailUtils.java +++ b/src/main/java/net/frozenorb/apiv3/util/EmailUtils.java @@ -1,15 +1,17 @@ package net.frozenorb.apiv3.util; import com.google.common.collect.ImmutableSet; -import io.vertx.core.http.HttpClient; -import io.vertx.core.http.HttpClientOptions; -import lombok.experimental.UtilityClass; + import net.frozenorb.apiv3.APIv3; import java.util.Set; import java.util.concurrent.TimeUnit; import java.util.regex.Pattern; +import io.vertx.core.http.HttpClient; +import io.vertx.core.http.HttpClientOptions; +import lombok.experimental.UtilityClass; + @UtilityClass public class EmailUtils { diff --git a/src/main/java/net/frozenorb/apiv3/util/ErrorUtils.java b/src/main/java/net/frozenorb/apiv3/util/ErrorUtils.java index d384f14..89f746d 100644 --- a/src/main/java/net/frozenorb/apiv3/util/ErrorUtils.java +++ b/src/main/java/net/frozenorb/apiv3/util/ErrorUtils.java @@ -1,13 +1,15 @@ package net.frozenorb.apiv3.util; import com.google.common.collect.ImmutableMap; -import io.vertx.ext.web.RoutingContext; -import lombok.experimental.UtilityClass; -import lombok.extern.slf4j.Slf4j; + import net.frozenorb.apiv3.APIv3; import java.util.Map; +import io.vertx.ext.web.RoutingContext; +import lombok.experimental.UtilityClass; +import lombok.extern.slf4j.Slf4j; + @Slf4j @UtilityClass public class ErrorUtils { diff --git a/src/main/java/net/frozenorb/apiv3/util/IpUtils.java b/src/main/java/net/frozenorb/apiv3/util/IpUtils.java index 4a267ae..f076b60 100644 --- a/src/main/java/net/frozenorb/apiv3/util/IpUtils.java +++ b/src/main/java/net/frozenorb/apiv3/util/IpUtils.java @@ -1,9 +1,9 @@ package net.frozenorb.apiv3.util; -import lombok.experimental.UtilityClass; - import java.util.regex.Pattern; +import lombok.experimental.UtilityClass; + @UtilityClass public class IpUtils { diff --git a/src/main/java/net/frozenorb/apiv3/util/MandrillUtils.java b/src/main/java/net/frozenorb/apiv3/util/MandrillUtils.java index 7c02886..c867d67 100644 --- a/src/main/java/net/frozenorb/apiv3/util/MandrillUtils.java +++ b/src/main/java/net/frozenorb/apiv3/util/MandrillUtils.java @@ -1,15 +1,18 @@ package net.frozenorb.apiv3.util; import com.google.common.net.MediaType; + import com.mongodb.async.SingleResultCallback; + +import net.frozenorb.apiv3.APIv3; + +import java.io.IOException; + import io.vertx.core.http.HttpClient; import io.vertx.core.http.HttpHeaders; import io.vertx.core.json.JsonArray; import io.vertx.core.json.JsonObject; import lombok.experimental.UtilityClass; -import net.frozenorb.apiv3.APIv3; - -import java.io.IOException; @UtilityClass public class MandrillUtils { diff --git a/src/main/java/net/frozenorb/apiv3/util/MaxMindUtils.java b/src/main/java/net/frozenorb/apiv3/util/MaxMindUtils.java index 55549cc..96fc014 100644 --- a/src/main/java/net/frozenorb/apiv3/util/MaxMindUtils.java +++ b/src/main/java/net/frozenorb/apiv3/util/MaxMindUtils.java @@ -1,7 +1,14 @@ package net.frozenorb.apiv3.util; import com.google.common.base.Charsets; + import com.mongodb.async.SingleResultCallback; + +import net.frozenorb.apiv3.APIv3; +import net.frozenorb.apiv3.maxmind.MaxMindResult; + +import java.util.Base64; + import io.vertx.circuitbreaker.CircuitBreaker; import io.vertx.circuitbreaker.CircuitBreakerOptions; import io.vertx.core.http.HttpClient; @@ -9,10 +16,6 @@ import io.vertx.core.http.HttpClientOptions; import io.vertx.core.json.JsonObject; import lombok.experimental.UtilityClass; import lombok.extern.slf4j.Slf4j; -import net.frozenorb.apiv3.APIv3; -import net.frozenorb.apiv3.maxmind.MaxMindResult; - -import java.util.Base64; @UtilityClass @Slf4j diff --git a/src/main/java/net/frozenorb/apiv3/util/MojangUtils.java b/src/main/java/net/frozenorb/apiv3/util/MojangUtils.java index a8fe16d..a083f74 100644 --- a/src/main/java/net/frozenorb/apiv3/util/MojangUtils.java +++ b/src/main/java/net/frozenorb/apiv3/util/MojangUtils.java @@ -1,15 +1,17 @@ package net.frozenorb.apiv3.util; import com.mongodb.async.SingleResultCallback; + +import net.frozenorb.apiv3.APIv3; + +import java.io.IOException; +import java.util.UUID; + import io.vertx.core.http.HttpClient; import io.vertx.core.http.HttpClientOptions; import io.vertx.core.json.DecodeException; import io.vertx.core.json.JsonObject; import lombok.experimental.UtilityClass; -import net.frozenorb.apiv3.APIv3; - -import java.io.IOException; -import java.util.UUID; @UtilityClass public class MojangUtils { diff --git a/src/main/java/net/frozenorb/apiv3/util/PasswordUtils.java b/src/main/java/net/frozenorb/apiv3/util/PasswordUtils.java index c21cdc8..e9a1dee 100644 --- a/src/main/java/net/frozenorb/apiv3/util/PasswordUtils.java +++ b/src/main/java/net/frozenorb/apiv3/util/PasswordUtils.java @@ -1,10 +1,11 @@ package net.frozenorb.apiv3.util; import com.google.common.collect.ImmutableList; -import lombok.experimental.UtilityClass; import java.util.List; +import lombok.experimental.UtilityClass; + @UtilityClass public class PasswordUtils { diff --git a/src/main/java/net/frozenorb/apiv3/util/PermissionUtils.java b/src/main/java/net/frozenorb/apiv3/util/PermissionUtils.java index 588953c..e849125 100644 --- a/src/main/java/net/frozenorb/apiv3/util/PermissionUtils.java +++ b/src/main/java/net/frozenorb/apiv3/util/PermissionUtils.java @@ -2,7 +2,7 @@ package net.frozenorb.apiv3.util; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import lombok.experimental.UtilityClass; + import net.frozenorb.apiv3.model.Rank; import java.util.HashMap; @@ -10,6 +10,8 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; +import lombok.experimental.UtilityClass; + @UtilityClass public class PermissionUtils { diff --git a/src/main/java/net/frozenorb/apiv3/util/PhoneUtils.java b/src/main/java/net/frozenorb/apiv3/util/PhoneUtils.java index dc61d0e..02f9e27 100644 --- a/src/main/java/net/frozenorb/apiv3/util/PhoneUtils.java +++ b/src/main/java/net/frozenorb/apiv3/util/PhoneUtils.java @@ -3,6 +3,7 @@ package net.frozenorb.apiv3.util; import com.google.i18n.phonenumbers.NumberParseException; import com.google.i18n.phonenumbers.PhoneNumberUtil; import com.google.i18n.phonenumbers.Phonenumber; + import lombok.experimental.UtilityClass; @UtilityClass diff --git a/src/main/java/net/frozenorb/apiv3/util/SyncUtils.java b/src/main/java/net/frozenorb/apiv3/util/SyncUtils.java index 5fdcd97..8eef80d 100644 --- a/src/main/java/net/frozenorb/apiv3/util/SyncUtils.java +++ b/src/main/java/net/frozenorb/apiv3/util/SyncUtils.java @@ -1,13 +1,16 @@ package net.frozenorb.apiv3.util; import com.google.common.util.concurrent.SettableFuture; + import com.mongodb.async.SingleResultCallback; -import io.vertx.core.Context; -import lombok.experimental.UtilityClass; + import net.frozenorb.apiv3.APIv3; import java.util.concurrent.ExecutionException; +import io.vertx.core.Context; +import lombok.experimental.UtilityClass; + @UtilityClass public class SyncUtils { diff --git a/src/main/java/net/frozenorb/apiv3/util/TimeUtils.java b/src/main/java/net/frozenorb/apiv3/util/TimeUtils.java index fb1e741..cddbac1 100644 --- a/src/main/java/net/frozenorb/apiv3/util/TimeUtils.java +++ b/src/main/java/net/frozenorb/apiv3/util/TimeUtils.java @@ -1,9 +1,9 @@ package net.frozenorb.apiv3.util; -import lombok.experimental.UtilityClass; - import java.time.Instant; +import lombok.experimental.UtilityClass; + @UtilityClass public class TimeUtils { diff --git a/src/main/java/net/frozenorb/apiv3/util/TotpUtils.java b/src/main/java/net/frozenorb/apiv3/util/TotpUtils.java index 76302b1..7db8a38 100644 --- a/src/main/java/net/frozenorb/apiv3/util/TotpUtils.java +++ b/src/main/java/net/frozenorb/apiv3/util/TotpUtils.java @@ -3,14 +3,16 @@ package net.frozenorb.apiv3.util; import com.mongodb.async.SingleResultCallback; import com.warrenstrange.googleauth.GoogleAuthenticator; import com.warrenstrange.googleauth.GoogleAuthenticatorConfig; -import io.vertx.redis.RedisClient; -import io.vertx.redis.RedisOptions; -import lombok.experimental.UtilityClass; + import net.frozenorb.apiv3.APIv3; import net.frozenorb.apiv3.model.User; import java.util.concurrent.TimeUnit; +import io.vertx.redis.RedisClient; +import io.vertx.redis.RedisOptions; +import lombok.experimental.UtilityClass; + @UtilityClass public class TotpUtils { diff --git a/src/main/java/net/frozenorb/apiv3/util/UserSessionUtils.java b/src/main/java/net/frozenorb/apiv3/util/UserSessionUtils.java index 5cce56d..0b992ec 100644 --- a/src/main/java/net/frozenorb/apiv3/util/UserSessionUtils.java +++ b/src/main/java/net/frozenorb/apiv3/util/UserSessionUtils.java @@ -1,15 +1,17 @@ package net.frozenorb.apiv3.util; import com.mongodb.async.SingleResultCallback; -import io.vertx.redis.RedisClient; -import io.vertx.redis.RedisOptions; -import lombok.experimental.UtilityClass; + import net.frozenorb.apiv3.APIv3; import java.util.List; import java.util.UUID; import java.util.concurrent.TimeUnit; +import io.vertx.redis.RedisClient; +import io.vertx.redis.RedisOptions; +import lombok.experimental.UtilityClass; + @UtilityClass public class UserSessionUtils { diff --git a/src/main/java/net/frozenorb/apiv3/util/UuidUtils.java b/src/main/java/net/frozenorb/apiv3/util/UuidUtils.java index a4bc9d2..cb9b7e0 100644 --- a/src/main/java/net/frozenorb/apiv3/util/UuidUtils.java +++ b/src/main/java/net/frozenorb/apiv3/util/UuidUtils.java @@ -1,9 +1,9 @@ package net.frozenorb.apiv3.util; -import lombok.experimental.UtilityClass; - import java.util.UUID; +import lombok.experimental.UtilityClass; + @UtilityClass public class UuidUtils { diff --git a/src/main/java/net/frozenorb/apiv3/util/ZangUtils.java b/src/main/java/net/frozenorb/apiv3/util/ZangUtils.java index aae9e40..bb68fd8 100644 --- a/src/main/java/net/frozenorb/apiv3/util/ZangUtils.java +++ b/src/main/java/net/frozenorb/apiv3/util/ZangUtils.java @@ -2,18 +2,21 @@ package net.frozenorb.apiv3.util; import com.google.common.base.Charsets; import com.google.common.net.MediaType; + import com.mongodb.async.SingleResultCallback; -import io.vertx.core.http.HttpClient; -import io.vertx.core.http.HttpClientOptions; -import io.vertx.core.http.HttpHeaders; -import io.vertx.core.json.JsonObject; -import lombok.experimental.UtilityClass; + import net.frozenorb.apiv3.APIv3; import net.frozenorb.apiv3.zang.ZangResult; import java.io.IOException; import java.util.Base64; +import io.vertx.core.http.HttpClient; +import io.vertx.core.http.HttpClientOptions; +import io.vertx.core.http.HttpHeaders; +import io.vertx.core.json.JsonObject; +import lombok.experimental.UtilityClass; + @UtilityClass public class ZangUtils {