From c30f11ead42696a5c51e920912d3d2475e6068c9 Mon Sep 17 00:00:00 2001 From: Colin McDonald Date: Sun, 17 Jul 2016 16:51:18 -0400 Subject: [PATCH] Make cached type lookups case insensitive. Closes #47 --- src/main/java/net/frozenorb/apiv3/model/Rank.java | 8 ++++---- src/main/java/net/frozenorb/apiv3/model/Server.java | 8 ++++---- src/main/java/net/frozenorb/apiv3/model/ServerGroup.java | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/main/java/net/frozenorb/apiv3/model/Rank.java b/src/main/java/net/frozenorb/apiv3/model/Rank.java index ef013f7..6b1971e 100644 --- a/src/main/java/net/frozenorb/apiv3/model/Rank.java +++ b/src/main/java/net/frozenorb/apiv3/model/Rank.java @@ -40,7 +40,7 @@ public final class Rank { } public static Rank findById(String id) { - return rankIdCache.get(id); + return rankIdCache.get(id.toLowerCase()); } static { @@ -57,7 +57,7 @@ public final class Rank { Map working = new HashMap<>(); for (Rank rank : ranks) { - working.put(rank.getId(), rank); + working.put(rank.getId().toLowerCase(), rank); } rankIdCache = working; @@ -81,13 +81,13 @@ public final class Rank { public void insert(SingleResultCallback callback) { rankCache.add(this); - rankIdCache.put(id, this); + rankIdCache.put(id.toLowerCase(), this); ranksCollection.insertOne(this, SyncUtils.vertxWrap(callback)); } public void delete(SingleResultCallback callback) { rankCache.remove(this); - rankIdCache.remove(id); + rankIdCache.remove(id.toLowerCase()); ranksCollection.deleteOne(new Document("_id", id), SyncUtils.vertxWrap(new MongoToVoidMongoCallback<>(callback))); } diff --git a/src/main/java/net/frozenorb/apiv3/model/Server.java b/src/main/java/net/frozenorb/apiv3/model/Server.java index 09ad250..2240ec2 100644 --- a/src/main/java/net/frozenorb/apiv3/model/Server.java +++ b/src/main/java/net/frozenorb/apiv3/model/Server.java @@ -39,7 +39,7 @@ public final class Server { } public static Server findById(String id) { - return serverIdCache.get(id); + return serverIdCache.get(id.toLowerCase()); } static { @@ -57,7 +57,7 @@ public final class Server { Map working = new HashMap<>(); for (Server server : servers) { - working.put(server.getId(), server); + working.put(server.getId().toLowerCase(), server); } serverIdCache = working; @@ -119,7 +119,7 @@ public final class Server { public void insert(SingleResultCallback callback) { serverCache.add(this); - serverIdCache.put(id, this); + serverIdCache.put(id.toLowerCase(), this); serversCollection.insertOne(this, SyncUtils.vertxWrap(callback)); } @@ -129,7 +129,7 @@ public final class Server { public void delete(SingleResultCallback callback) { serverCache.remove(this); - serverIdCache.remove(id); + serverIdCache.remove(id.toLowerCase()); serversCollection.deleteOne(new Document("_id", id), SyncUtils.vertxWrap(new MongoToVoidMongoCallback<>(callback))); } diff --git a/src/main/java/net/frozenorb/apiv3/model/ServerGroup.java b/src/main/java/net/frozenorb/apiv3/model/ServerGroup.java index c4d0467..31c819d 100644 --- a/src/main/java/net/frozenorb/apiv3/model/ServerGroup.java +++ b/src/main/java/net/frozenorb/apiv3/model/ServerGroup.java @@ -37,7 +37,7 @@ public final class ServerGroup { } public static ServerGroup findById(String id) { - return serverGroupIdCache.get(id); + return serverGroupIdCache.get(id.toLowerCase()); } public static ServerGroup findDefault() { @@ -58,7 +58,7 @@ public final class ServerGroup { Map working = new HashMap<>(); for (ServerGroup serverGroup : serverGroups) { - working.put(serverGroup.getId(), serverGroup); + working.put(serverGroup.getId().toLowerCase(), serverGroup); } serverGroupIdCache = working; @@ -83,7 +83,7 @@ public final class ServerGroup { public void insert(SingleResultCallback callback) { serverGroupCache.add(this); - serverGroupIdCache.put(id, this); + serverGroupIdCache.put(id.toLowerCase(), this); serverGroupsCollection.insertOne(this, SyncUtils.vertxWrap(callback)); } @@ -93,7 +93,7 @@ public final class ServerGroup { public void delete(SingleResultCallback callback) { serverGroupCache.remove(this); - serverGroupIdCache.remove(id); + serverGroupIdCache.remove(id.toLowerCase()); serverGroupsCollection.deleteOne(new Document("_id", id), SyncUtils.vertxWrap(new MongoToVoidMongoCallback<>(callback))); }