From 83d43ef57f48a8cf7d77a7b068aec98532470895 Mon Sep 17 00:00:00 2001 From: Colin McDonald Date: Sun, 7 Feb 2016 20:51:02 -0500 Subject: [PATCH] Create all model classes --- src/main/java/net/frozenorb/apiv3/APIv3.java | 6 ++---- src/main/java/net/frozenorb/apiv3/Main.java | 2 +- .../net/frozenorb/apiv3/collections/AuditLog.java | 7 +++++++ .../frozenorb/apiv3/collections/EmailTemplate.java | 7 +++++++ .../java/net/frozenorb/apiv3/collections/Grant.java | 7 +++++++ .../java/net/frozenorb/apiv3/collections/IPBan.java | 7 +++++++ .../java/net/frozenorb/apiv3/collections/IPLog.java | 7 +++++++ .../net/frozenorb/apiv3/collections/MaxMindCache.java | 7 +++++++ .../frozenorb/apiv3/collections/NotificationLog.java | 7 +++++++ .../net/frozenorb/apiv3/collections/Punishment.java | 7 +++++++ .../apiv3/{types => collections}/Server.java | 4 +--- .../net/frozenorb/apiv3/collections/ServerGroup.java | 7 +++++++ .../java/net/frozenorb/apiv3/collections/User.java | 7 +++++++ src/main/java/net/frozenorb/apiv3/types/Rank.java | 7 ------- .../java/net/frozenorb/apiv3/types/ServerGroup.java | 11 ----------- 15 files changed, 74 insertions(+), 26 deletions(-) create mode 100644 src/main/java/net/frozenorb/apiv3/collections/AuditLog.java create mode 100644 src/main/java/net/frozenorb/apiv3/collections/EmailTemplate.java create mode 100644 src/main/java/net/frozenorb/apiv3/collections/Grant.java create mode 100644 src/main/java/net/frozenorb/apiv3/collections/IPBan.java create mode 100644 src/main/java/net/frozenorb/apiv3/collections/IPLog.java create mode 100644 src/main/java/net/frozenorb/apiv3/collections/MaxMindCache.java create mode 100644 src/main/java/net/frozenorb/apiv3/collections/NotificationLog.java create mode 100644 src/main/java/net/frozenorb/apiv3/collections/Punishment.java rename src/main/java/net/frozenorb/apiv3/{types => collections}/Server.java (95%) create mode 100644 src/main/java/net/frozenorb/apiv3/collections/ServerGroup.java create mode 100644 src/main/java/net/frozenorb/apiv3/collections/User.java delete mode 100644 src/main/java/net/frozenorb/apiv3/types/Rank.java delete mode 100644 src/main/java/net/frozenorb/apiv3/types/ServerGroup.java diff --git a/src/main/java/net/frozenorb/apiv3/APIv3.java b/src/main/java/net/frozenorb/apiv3/APIv3.java index 9b3e009..6f6860e 100644 --- a/src/main/java/net/frozenorb/apiv3/APIv3.java +++ b/src/main/java/net/frozenorb/apiv3/APIv3.java @@ -1,17 +1,15 @@ package net.frozenorb.apiv3; -import com.google.common.collect.ImmutableList; import io.vertx.core.AbstractVerticle; import io.vertx.core.json.JsonArray; import io.vertx.core.json.JsonObject; import io.vertx.ext.mongo.MongoClient; import io.vertx.ext.web.Router; import lombok.Getter; -import net.frozenorb.apiv3.types.Server; -import net.frozenorb.apiv3.types.ServerGroup; +import net.frozenorb.apiv3.collections.Server; import net.frozenorb.apiv3.utils.ErrorUtils; -public class APIv3 extends AbstractVerticle { +public final class APIv3 extends AbstractVerticle { @Getter private static MongoClient mongoClient; diff --git a/src/main/java/net/frozenorb/apiv3/Main.java b/src/main/java/net/frozenorb/apiv3/Main.java index 145a553..9b9e044 100644 --- a/src/main/java/net/frozenorb/apiv3/Main.java +++ b/src/main/java/net/frozenorb/apiv3/Main.java @@ -2,7 +2,7 @@ package net.frozenorb.apiv3; import io.vertx.core.Vertx; -public class Main { +public final class Main { public static void main(String[] args) { Vertx.vertx().deployVerticle(new APIv3()); diff --git a/src/main/java/net/frozenorb/apiv3/collections/AuditLog.java b/src/main/java/net/frozenorb/apiv3/collections/AuditLog.java new file mode 100644 index 0000000..f14960f --- /dev/null +++ b/src/main/java/net/frozenorb/apiv3/collections/AuditLog.java @@ -0,0 +1,7 @@ +package net.frozenorb.apiv3.collections; + +public final class AuditLog { + + public static final String COLLECTION_NAME = "auditLog"; + +} \ No newline at end of file diff --git a/src/main/java/net/frozenorb/apiv3/collections/EmailTemplate.java b/src/main/java/net/frozenorb/apiv3/collections/EmailTemplate.java new file mode 100644 index 0000000..6dd1f05 --- /dev/null +++ b/src/main/java/net/frozenorb/apiv3/collections/EmailTemplate.java @@ -0,0 +1,7 @@ +package net.frozenorb.apiv3.collections; + +public final class EmailTemplate { + + public static final String COLLECTION_NAME = "emailTemplate"; + +} \ No newline at end of file diff --git a/src/main/java/net/frozenorb/apiv3/collections/Grant.java b/src/main/java/net/frozenorb/apiv3/collections/Grant.java new file mode 100644 index 0000000..83e250c --- /dev/null +++ b/src/main/java/net/frozenorb/apiv3/collections/Grant.java @@ -0,0 +1,7 @@ +package net.frozenorb.apiv3.collections; + +public final class Grant { + + public static final String COLLECTION_NAME = "grant"; + +} \ No newline at end of file diff --git a/src/main/java/net/frozenorb/apiv3/collections/IPBan.java b/src/main/java/net/frozenorb/apiv3/collections/IPBan.java new file mode 100644 index 0000000..fb01899 --- /dev/null +++ b/src/main/java/net/frozenorb/apiv3/collections/IPBan.java @@ -0,0 +1,7 @@ +package net.frozenorb.apiv3.collections; + +public final class IPBan { + + public static final String COLLECTION_NAME = "ipBan"; + +} \ No newline at end of file diff --git a/src/main/java/net/frozenorb/apiv3/collections/IPLog.java b/src/main/java/net/frozenorb/apiv3/collections/IPLog.java new file mode 100644 index 0000000..4b4e2e8 --- /dev/null +++ b/src/main/java/net/frozenorb/apiv3/collections/IPLog.java @@ -0,0 +1,7 @@ +package net.frozenorb.apiv3.collections; + +public final class IPLog { + + public static final String COLLECTION_NAME = "ipLog"; + +} \ No newline at end of file diff --git a/src/main/java/net/frozenorb/apiv3/collections/MaxMindCache.java b/src/main/java/net/frozenorb/apiv3/collections/MaxMindCache.java new file mode 100644 index 0000000..ba5ce9c --- /dev/null +++ b/src/main/java/net/frozenorb/apiv3/collections/MaxMindCache.java @@ -0,0 +1,7 @@ +package net.frozenorb.apiv3.collections; + +public final class MaxMindCache { + + public static final String COLLECTION_NAME = "maxMindCache"; + +} \ No newline at end of file diff --git a/src/main/java/net/frozenorb/apiv3/collections/NotificationLog.java b/src/main/java/net/frozenorb/apiv3/collections/NotificationLog.java new file mode 100644 index 0000000..76888e5 --- /dev/null +++ b/src/main/java/net/frozenorb/apiv3/collections/NotificationLog.java @@ -0,0 +1,7 @@ +package net.frozenorb.apiv3.collections; + +public final class NotificationLog { + + public static final String COLLECTION_NAME = "notificationLog"; + +} \ No newline at end of file diff --git a/src/main/java/net/frozenorb/apiv3/collections/Punishment.java b/src/main/java/net/frozenorb/apiv3/collections/Punishment.java new file mode 100644 index 0000000..679d003 --- /dev/null +++ b/src/main/java/net/frozenorb/apiv3/collections/Punishment.java @@ -0,0 +1,7 @@ +package net.frozenorb.apiv3.collections; + +public final class Punishment { + + public static final String COLLECTION_NAME = "punishment"; + +} \ No newline at end of file diff --git a/src/main/java/net/frozenorb/apiv3/types/Server.java b/src/main/java/net/frozenorb/apiv3/collections/Server.java similarity index 95% rename from src/main/java/net/frozenorb/apiv3/types/Server.java rename to src/main/java/net/frozenorb/apiv3/collections/Server.java index 3952aa4..1a4bc96 100644 --- a/src/main/java/net/frozenorb/apiv3/types/Server.java +++ b/src/main/java/net/frozenorb/apiv3/collections/Server.java @@ -1,7 +1,5 @@ -package net.frozenorb.apiv3.types; +package net.frozenorb.apiv3.collections; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableSet; import io.vertx.core.AsyncResult; import io.vertx.core.Handler; import io.vertx.core.json.JsonArray; diff --git a/src/main/java/net/frozenorb/apiv3/collections/ServerGroup.java b/src/main/java/net/frozenorb/apiv3/collections/ServerGroup.java new file mode 100644 index 0000000..f109cdd --- /dev/null +++ b/src/main/java/net/frozenorb/apiv3/collections/ServerGroup.java @@ -0,0 +1,7 @@ +package net.frozenorb.apiv3.collections; + +public final class ServerGroup { + + public static final String COLLECTION_NAME = "serverGroup"; + +} \ No newline at end of file diff --git a/src/main/java/net/frozenorb/apiv3/collections/User.java b/src/main/java/net/frozenorb/apiv3/collections/User.java new file mode 100644 index 0000000..4a293fb --- /dev/null +++ b/src/main/java/net/frozenorb/apiv3/collections/User.java @@ -0,0 +1,7 @@ +package net.frozenorb.apiv3.collections; + +public final class User { + + public static final String COLLECTION_NAME = "user"; + +} \ No newline at end of file diff --git a/src/main/java/net/frozenorb/apiv3/types/Rank.java b/src/main/java/net/frozenorb/apiv3/types/Rank.java deleted file mode 100644 index cd92d59..0000000 --- a/src/main/java/net/frozenorb/apiv3/types/Rank.java +++ /dev/null @@ -1,7 +0,0 @@ -package net.frozenorb.apiv3.types; - -public class Rank { - - - -} \ No newline at end of file diff --git a/src/main/java/net/frozenorb/apiv3/types/ServerGroup.java b/src/main/java/net/frozenorb/apiv3/types/ServerGroup.java deleted file mode 100644 index 0f75519..0000000 --- a/src/main/java/net/frozenorb/apiv3/types/ServerGroup.java +++ /dev/null @@ -1,11 +0,0 @@ -package net.frozenorb.apiv3.types; - -import lombok.Getter; - -public class ServerGroup { - - @Getter private String id; - @Getter private ServerGroup[] inheritsFrom; - //@Getter private Map<> - -} \ No newline at end of file