From fbf0475950786a1978d295c9e6e9c318a94c7ca8 Mon Sep 17 00:00:00 2001 From: Mads Boddum Date: Thu, 10 Sep 2015 13:32:15 +0200 Subject: [PATCH] Made the SQL query in SpawnerService a field in order to make the code easier to read --- src/services/spawn/SpawnerService.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/services/spawn/SpawnerService.java b/src/services/spawn/SpawnerService.java index 8300cf192..62a7aebea 100644 --- a/src/services/spawn/SpawnerService.java +++ b/src/services/spawn/SpawnerService.java @@ -50,6 +50,9 @@ public final class SpawnerService extends Service { private final ObjectManager objectManager; private final Collection spawners; private final RelationalServerData spawnerDatabase; + private static final String QUERY = "SELECT static.*, buildings.object_id, buildings.terrain_name FROM static " + + "INNER JOIN buildings ON static.building_id = buildings.building_id " + + "GROUP BY buildings.building_id"; public SpawnerService(ObjectManager objectManager) { this.objectManager = objectManager; @@ -100,11 +103,7 @@ public final class SpawnerService extends Service { private void loadSpawners() { try { - ResultSet jointTable = spawnerDatabase.prepareStatement( - "SELECT static.*, buildings.object_id, buildings.terrain_name FROM static " - + "INNER JOIN buildings ON static.building_id = buildings.building_id " - + "GROUP BY buildings.building_id" - ).executeQuery(); + ResultSet jointTable = spawnerDatabase.prepareStatement(QUERY).executeQuery(); while (jointTable.next()) { if(jointTable.getBoolean("active")) { Location loc = new Location(jointTable.getFloat("x"), jointTable.getFloat("y"), jointTable.getFloat("z"), Terrain.valueOf(jointTable.getString("terrain_name")));