Optimize imports

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;

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.model.BannedAsn;
-import net.frozenorb.apiv3.route.*;
+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.servers.DELETEServersId;
-import net.frozenorb.apiv3.route.users.*;
+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 {
 

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 {
 

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

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

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

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

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

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 {
 

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 {
 

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 {
 

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 {
 

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;

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 {
 

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 {

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 {
 

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 {
 

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 {
 

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 {
 

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 {

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

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

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 {

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 {
 

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 {

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 {

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 {
 

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 {
 

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 {
 

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

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<RoutingContext> {
 
 	private static final DecimalFormat coordinateFormat = new DecimalFormat("#.#####");

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

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<RoutingContext> {
 
     public void handle(RoutingContext ctx) {

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<RoutingContext> {
 
 	public void handle(RoutingContext ctx) {

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<RoutingContext> {
 
 	public void handle(RoutingContext ctx) {

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<RoutingContext> {
 
 	public void handle(RoutingContext ctx) {

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<RoutingContext> {
 
 	public void handle(RoutingContext ctx) {

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<RoutingContext> {
 
 	public void handle(RoutingContext ctx) {

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<RoutingContext> {
 
 	public void handle(RoutingContext ctx) {

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<RoutingContext> {
 
 	public void handle(RoutingContext ctx) {

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<RoutingContext> {
 
 	public void handle(RoutingContext ctx) {

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<RoutingContext> {
 
 	public void handle(RoutingContext ctx) {

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<RoutingContext> {
 
 	public void handle(RoutingContext ctx) {

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

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

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<RoutingContext> {
 
 	public void handle(RoutingContext ctx) {

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<RoutingContext> {
 
 	public void handle(RoutingContext ctx) {

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

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

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<RoutingContext> {
 
 	public void handle(RoutingContext ctx) {

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<RoutingContext> {
 
 	public void handle(RoutingContext ctx) {

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<RoutingContext> {
 
 	public void handle(RoutingContext ctx) {

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<RoutingContext> {
 
 	public void handle(RoutingContext ctx) {

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<RoutingContext> {
 
 	public void handle(RoutingContext ctx) {

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<RoutingContext> {
 
 	public void handle(RoutingContext ctx) {

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

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<RoutingContext> {
 
 	public void handle(RoutingContext ctx) {

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<RoutingContext> {
 
 	public void handle(RoutingContext ctx) {

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<RoutingContext> {
 
 	public void handle(RoutingContext ctx) {

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<RoutingContext> {
 
 	public void handle(RoutingContext ctx) {

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<RoutingContext> {
 
 	public void handle(RoutingContext ctx) {

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<RoutingContext> {
 
 	public void handle(RoutingContext ctx) {

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<RoutingContext> {
 
 	public void handle(RoutingContext ctx) {

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<RoutingContext> {
 
 	public void handle(RoutingContext ctx) {

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<RoutingContext> {
 
 	public void handle(RoutingContext ctx) {

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<RoutingContext> {
 
 	public void handle(RoutingContext ctx) {

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<RoutingContext> {
 
 	public void handle(RoutingContext ctx) {

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<RoutingContext> {
 
 	public void handle(RoutingContext ctx) {

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<RoutingContext> {
 
     private static final MongoCollection<Document> usersCollection = APIv3.getDatabase().getCollection("users");

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

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<RoutingContext> {
 
 	public void handle(RoutingContext ctx) {

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<RoutingContext> {
 
 	public void handle(RoutingContext ctx) {

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<RoutingContext> {
 
 	public void handle(RoutingContext ctx) {

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<RoutingContext> {
 
 	public void handle(RoutingContext ctx) {

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<RoutingContext> {
 
 	public void handle(RoutingContext ctx) {

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<RoutingContext> {
 
 	public void handle(RoutingContext ctx) {

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<RoutingContext> {
 
 	public void handle(RoutingContext ctx) {

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<RoutingContext> {
 
 	public void handle(RoutingContext ctx) {

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<RoutingContext> {
 
 	public void handle(RoutingContext ctx) {

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<RoutingContext> {
 
 	public void handle(RoutingContext ctx) {

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<RoutingContext> {
 
 	public void handle(RoutingContext ctx) {

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

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

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<RoutingContext> {
 
 	public void handle(RoutingContext ctx) {

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<RoutingContext> {
 
 	public void handle(RoutingContext ctx) {

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

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

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<RoutingContext> {
 
 	public void handle(RoutingContext ctx) {

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<RoutingContext> {
 
 	public void handle(RoutingContext ctx) {

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

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

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<RoutingContext> {
 
 	public void handle(RoutingContext ctx) {

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

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

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<RoutingContext> {
 
 	public void handle(RoutingContext ctx) {

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<RoutingContext> {
 
 	public void handle(RoutingContext ctx) {

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<RoutingContext> {
 
 	public void handle(RoutingContext ctx) {

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<RoutingContext> {
 
 	public void handle(RoutingContext ctx) {

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<RoutingContext> {
 
 	public void handle(RoutingContext ctx) {

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