The-pack-family
/
APIv3
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix initial deployment issues

This commit is contained in:
Colin McDonald 2016-12-16 19:54:06 -05:00
parent 6cd0cb31ec
commit 23bcc1d985
7 changed files with 38 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/net/frozenorb/apiv3/APIv3.java
View File

@ -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

2
src/main/java/net/frozenorb/apiv3/Main.java
View File

@ -12,7 +12,7 @@ import io.vertx.core.Vertx;
@SpringBootApplication
@EnableScheduling
class Main {
public class Main {
@Autowired private APIv3 verticle;
@Autowired private Environment environment;

20
src/main/java/net/frozenorb/apiv3/model/BannedAsn.java
View File

@ -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<BannedAsn> bannedAsns = SyncUtils.runBlocking(v -> bannedAsnsCollection.find().into(new LinkedList<>(), v));
Map<Integer, BannedAsn> working = new HashMap<>();
Map<Integer, BannedAsn> 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

20
src/main/java/net/frozenorb/apiv3/model/BannedCellCarrier.java
View File

@ -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<BannedCellCarrier> bannedCellCarriers = SyncUtils.runBlocking(v -> bannedCellCarriersCollection.find().into(new LinkedList<>(), v));
Map<Integer, BannedCellCarrier> working = new HashMap<>();
Map<Integer, BannedCellCarrier> 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

20
src/main/java/net/frozenorb/apiv3/model/Rank.java
View File

@ -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<Rank> ranks = SyncUtils.runBlocking(v -> ranksCollection.find().into(new LinkedList<>(), v));
Map<String, Rank> working = new HashMap<>();
Map<String, Rank> 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

20
src/main/java/net/frozenorb/apiv3/model/Server.java
View File

@ -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<Server> servers = SyncUtils.runBlocking(v -> serversCollection.find().into(new LinkedList<>(), v));
Map<String, Server> working = new HashMap<>();
Map<String, Server> 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() {

20
src/main/java/net/frozenorb/apiv3/model/ServerGroup.java
View File

@ -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<ServerGroup> serverGroups = SyncUtils.runBlocking(v -> serverGroupsCollection.find().into(new LinkedList<>(), v));
Map<String, ServerGroup> working = new HashMap<>();
Map<String, ServerGroup> 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