diff --git a/src/main/java/net/frozenorb/apiv3/APIv3.java b/src/main/java/net/frozenorb/apiv3/APIv3.java index 4cbe21f..262a4fa 100644 --- a/src/main/java/net/frozenorb/apiv3/APIv3.java +++ b/src/main/java/net/frozenorb/apiv3/APIv3.java @@ -99,7 +99,6 @@ import net.frozenorb.apiv3.util.SpringUtils; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; import org.springframework.context.annotation.Bean; -import org.springframework.core.env.Environment; import org.springframework.stereotype.Component; import java.time.Instant; @@ -132,13 +131,13 @@ public final class APIv3 extends AbstractVerticle implements ApplicationContextA @Override public void start() { - setupHttpServer(); - BannedAsn.updateCache(); BannedCellCarrier.updateCache(); Rank.updateCache(); Server.updateCache(); ServerGroup.updateCache(); + + setupHttpServer(); } @Override diff --git a/src/main/java/net/frozenorb/apiv3/Main.java b/src/main/java/net/frozenorb/apiv3/Main.java index 974ff36..f966c5c 100644 --- a/src/main/java/net/frozenorb/apiv3/Main.java +++ b/src/main/java/net/frozenorb/apiv3/Main.java @@ -12,7 +12,7 @@ import io.vertx.core.Vertx; @SpringBootApplication @EnableScheduling -class Main { +public class Main { @Autowired private APIv3 verticle; @Autowired private Environment environment; diff --git a/src/main/java/net/frozenorb/apiv3/model/BannedAsn.java b/src/main/java/net/frozenorb/apiv3/model/BannedAsn.java index 197474a..70a4640 100644 --- a/src/main/java/net/frozenorb/apiv3/model/BannedAsn.java +++ b/src/main/java/net/frozenorb/apiv3/model/BannedAsn.java @@ -51,21 +51,15 @@ public final class BannedAsn { } public static void updateCache() { - bannedAsnsCollection.find().into(new LinkedList<>(), SyncUtils.vertxWrap((bannedAsns, error) -> { - if (error != null) { - error.printStackTrace(); - return; - } + List bannedAsns = SyncUtils.runBlocking(v -> bannedAsnsCollection.find().into(new LinkedList<>(), v)); + Map working = new HashMap<>(); - Map working = new HashMap<>(); + for (BannedAsn bannedAsn : bannedAsns) { + working.put(bannedAsn.getId(), bannedAsn); + } - for (BannedAsn bannedAsn : bannedAsns) { - working.put(bannedAsn.getId(), bannedAsn); - } - - bannedAsnIdCache = working; - bannedAsnCache = bannedAsns; - })); + bannedAsnIdCache = working; + bannedAsnCache = bannedAsns; } private BannedAsn() {} // For Jackson diff --git a/src/main/java/net/frozenorb/apiv3/model/BannedCellCarrier.java b/src/main/java/net/frozenorb/apiv3/model/BannedCellCarrier.java index 1b50584..0620d20 100644 --- a/src/main/java/net/frozenorb/apiv3/model/BannedCellCarrier.java +++ b/src/main/java/net/frozenorb/apiv3/model/BannedCellCarrier.java @@ -52,21 +52,15 @@ public final class BannedCellCarrier { } public static void updateCache() { - bannedCellCarriersCollection.find().into(new LinkedList<>(), SyncUtils.vertxWrap((bannedCellCarriers, error) -> { - if (error != null) { - error.printStackTrace(); - return; - } + List bannedCellCarriers = SyncUtils.runBlocking(v -> bannedCellCarriersCollection.find().into(new LinkedList<>(), v)); + Map working = new HashMap<>(); - Map working = new HashMap<>(); + for (BannedCellCarrier bannedCellCarrier : bannedCellCarriers) { + working.put(bannedCellCarrier.getId(), bannedCellCarrier); + } - for (BannedCellCarrier bannedCellCarrier : bannedCellCarriers) { - working.put(bannedCellCarrier.getId(), bannedCellCarrier); - } - - bannedCellCarrierIdCache = working; - bannedCellCarrierCache = bannedCellCarriers; - })); + bannedCellCarrierIdCache = working; + bannedCellCarrierCache = bannedCellCarriers; } private BannedCellCarrier() {} // For Jackson diff --git a/src/main/java/net/frozenorb/apiv3/model/Rank.java b/src/main/java/net/frozenorb/apiv3/model/Rank.java index 61654ab..71c3ce7 100644 --- a/src/main/java/net/frozenorb/apiv3/model/Rank.java +++ b/src/main/java/net/frozenorb/apiv3/model/Rank.java @@ -57,21 +57,15 @@ public final class Rank { } public static void updateCache() { - ranksCollection.find().into(new LinkedList<>(), SyncUtils.vertxWrap((ranks, error) -> { - if (error != null) { - error.printStackTrace(); - return; - } + List ranks = SyncUtils.runBlocking(v -> ranksCollection.find().into(new LinkedList<>(), v)); + Map working = new HashMap<>(); - Map working = new HashMap<>(); + for (Rank rank : ranks) { + working.put(rank.getId().toLowerCase(), rank); + } - for (Rank rank : ranks) { - working.put(rank.getId().toLowerCase(), rank); - } - - rankIdCache = working; - rankCache = ranks; - })); + rankIdCache = working; + rankCache = ranks; } private Rank() {} // For Jackson diff --git a/src/main/java/net/frozenorb/apiv3/model/Server.java b/src/main/java/net/frozenorb/apiv3/model/Server.java index 6ee0c79..cce5007 100644 --- a/src/main/java/net/frozenorb/apiv3/model/Server.java +++ b/src/main/java/net/frozenorb/apiv3/model/Server.java @@ -61,21 +61,15 @@ public final class Server { } public static void updateCache() { - serversCollection.find().into(new LinkedList<>(), SyncUtils.vertxWrap((servers, error) -> { - if (error != null) { - error.printStackTrace(); - return; - } + List servers = SyncUtils.runBlocking(v -> serversCollection.find().into(new LinkedList<>(), v)); + Map working = new HashMap<>(); - Map working = new HashMap<>(); + for (Server server : servers) { + working.put(server.getId().toLowerCase(), server); + } - for (Server server : servers) { - working.put(server.getId().toLowerCase(), server); - } - - serverIdCache = working; - serverCache = servers; - })); + serverIdCache = working; + serverCache = servers; } private static void updateTimedOutServers() { diff --git a/src/main/java/net/frozenorb/apiv3/model/ServerGroup.java b/src/main/java/net/frozenorb/apiv3/model/ServerGroup.java index 7377807..3142ad9 100644 --- a/src/main/java/net/frozenorb/apiv3/model/ServerGroup.java +++ b/src/main/java/net/frozenorb/apiv3/model/ServerGroup.java @@ -59,21 +59,15 @@ public final class ServerGroup { } public static void updateCache() { - serverGroupsCollection.find().into(new LinkedList<>(), SyncUtils.vertxWrap((serverGroups, error) -> { - if (error != null) { - error.printStackTrace(); - return; - } + List serverGroups = SyncUtils.runBlocking(v -> serverGroupsCollection.find().into(new LinkedList<>(), v)); + Map working = new HashMap<>(); - Map working = new HashMap<>(); + for (ServerGroup serverGroup : serverGroups) { + working.put(serverGroup.getId().toLowerCase(), serverGroup); + } - for (ServerGroup serverGroup : serverGroups) { - working.put(serverGroup.getId().toLowerCase(), serverGroup); - } - - serverGroupIdCache = working; - serverGroupCache = serverGroups; - })); + serverGroupIdCache = working; + serverGroupCache = serverGroups; } private ServerGroup() {} // For Jackson