Merge pull request #43 from FrozenOrb/reformat-test

Proper formatting
This commit is contained in:
Colin McDonald 2016-07-14 21:58:30 -04:00 committed by GitHub
commit 8f7f19035f
137 changed files with 4484 additions and 4476 deletions

View File

@ -193,33 +193,40 @@ public final class APIv3 extends AbstractVerticle {
new IndexModel(new Document("user", 1)), new IndexModel(new Document("user", 1)),
new IndexModel(new Document("performedAt", 1)), new IndexModel(new Document("performedAt", 1)),
new IndexModel(new Document("type", 1)) new IndexModel(new Document("type", 1))
), (a, b) -> {}); ), (a, b) -> {
});
database.getCollection("grants").createIndexes(ImmutableList.of( database.getCollection("grants").createIndexes(ImmutableList.of(
new IndexModel(new Document("user", 1)), new IndexModel(new Document("user", 1)),
new IndexModel(new Document("rank", 1)), new IndexModel(new Document("rank", 1)),
new IndexModel(new Document("addedAt", 1)) new IndexModel(new Document("addedAt", 1))
), (a, b) -> {}); ), (a, b) -> {
});
database.getCollection("ipLog").createIndexes(ImmutableList.of( database.getCollection("ipLog").createIndexes(ImmutableList.of(
new IndexModel(new Document("user", 1)), new IndexModel(new Document("user", 1)),
new IndexModel(new Document("user", 1).append("userIp", 1)) new IndexModel(new Document("user", 1).append("userIp", 1))
), (a, b) -> {}); ), (a, b) -> {
});
database.getCollection("ipBans").createIndexes(ImmutableList.of( database.getCollection("ipBans").createIndexes(ImmutableList.of(
new IndexModel(new Document("userIp", 1)) new IndexModel(new Document("userIp", 1))
), (a, b) -> {}); ), (a, b) -> {
});
database.getCollection("punishments").createIndexes(ImmutableList.of( database.getCollection("punishments").createIndexes(ImmutableList.of(
new IndexModel(new Document("user", 1)), new IndexModel(new Document("user", 1)),
new IndexModel(new Document("type", 1)), new IndexModel(new Document("type", 1)),
new IndexModel(new Document("addedAt", 1)), new IndexModel(new Document("addedAt", 1)),
new IndexModel(new Document("addedBy", 1)), new IndexModel(new Document("addedBy", 1)),
new IndexModel(new Document("linkedIpBanId", 1)) new IndexModel(new Document("linkedIpBanId", 1))
), (a, b) -> {}); ), (a, b) -> {
});
database.getCollection("users").createIndexes(ImmutableList.of( database.getCollection("users").createIndexes(ImmutableList.of(
new IndexModel(new Document("lastUsername", 1)), new IndexModel(new Document("lastUsername", 1)),
new IndexModel(new Document("emailToken", 1)) new IndexModel(new Document("emailToken", 1))
), (a, b) -> {}); ), (a, b) -> {
});
database.getCollection("userMeta").createIndexes(ImmutableList.of( database.getCollection("userMeta").createIndexes(ImmutableList.of(
new IndexModel(new Document("user", 1).append("serverGroup", 1)) new IndexModel(new Document("user", 1).append("serverGroup", 1))
), (a, b) -> {}); ), (a, b) -> {
});
BannedAsn.updateCache(); BannedAsn.updateCache();
BannedCellCarrier.updateCache(); BannedCellCarrier.updateCache();

View File

@ -3,7 +3,9 @@ package net.frozenorb.apiv3.actor;
public interface Actor { public interface Actor {
boolean isAuthorized(); boolean isAuthorized();
String getName(); String getName();
ActorType getType(); ActorType getType();
} }

View File

@ -35,7 +35,6 @@ public enum AuditLogActionType {
CHAT_FILTER_ENTRY_UPDATE(false), CHAT_FILTER_ENTRY_UPDATE(false),
CHAT_FILTER_ENTRY_DELETE(false), CHAT_FILTER_ENTRY_DELETE(false),
PUNISHMENT_CREATE(true) { PUNISHMENT_CREATE(true) {
@Override @Override
public void reverse(AuditLogEntry entry, SingleResultCallback<Void> callback) { public void reverse(AuditLogEntry entry, SingleResultCallback<Void> callback) {
String punishmentId = (String) entry.getMetadata().get("punishmentId"); String punishmentId = (String) entry.getMetadata().get("punishmentId");