Refactor to remove abstraction

This commit is contained in:
2023-05-21 17:00:17 -04:00
parent e203945ea3
commit 4d08857de1
2 changed files with 200 additions and 146 deletions
+198 -143
View File
@@ -17,173 +17,228 @@ import engine.objects.City;
import engine.objects.Zone; import engine.objects.Zone;
import org.pmw.tinylog.Logger; import org.pmw.tinylog.Logger;
import java.net.UnknownHostException; import java.sql.*;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.ArrayList; import java.util.ArrayList;
public class dbCityHandler extends dbHandlerBase { public class dbCityHandler extends dbHandlerBase {
public dbCityHandler() { public dbCityHandler() {
this.localClass = City.class; this.localClass = City.class;
this.localObjectType = Enum.GameObjectType.valueOf(this.localClass.getSimpleName()); this.localObjectType = Enum.GameObjectType.valueOf(this.localClass.getSimpleName());
} }
public ArrayList<AbstractGameObject> CREATE_CITY(int ownerID, int parentZoneID, int realmID, float xCoord, float yCoord, float zCoord, float rotation, float W, String name, LocalDateTime established) { public static void addObject(ArrayList<AbstractGameObject> list, ResultSet rs) throws SQLException {
prepareCallable("CALL `city_CREATE`(?, ?, ?, ?, ?, ?, ?, ?, ?,?,?)"); String type = rs.getString("type");
LocalDateTime upgradeTime = LocalDateTime.now().plusHours(2); switch (type) {
setLong(1, (long) ownerID); //objectUUID of owning player case "zone":
setLong(2, (long) parentZoneID); //objectUUID of parent (continent) zone Zone zone = new Zone(rs);
setLong(3, (long) realmID); //objectUUID of realm city belongs in DbManager.addToCache(zone);
setFloat(4, xCoord); //xOffset from parentZone center list.add(zone);
setFloat(5, yCoord); //yOffset from parentZone center break;
setFloat(6, zCoord); //zOffset from parentZone center case "building":
setString(7, name); //city name Building building = new Building(rs);
setLocalDateTime(8, established); DbManager.addToCache(building);
setFloat(9, rotation); list.add(building);
setFloat(10, W); break;
setLocalDateTime(11, upgradeTime); case "city":
ArrayList<AbstractGameObject> list = new ArrayList<>(); City city = new City(rs);
DbManager.addToCache(city);
list.add(city);
break;
}
}
try { public ArrayList<AbstractGameObject> CREATE_CITY(int ownerID, int parentZoneID, int realmID, float xCoord, float yCoord, float zCoord, float rotation, float W, String name, LocalDateTime established) {
boolean work = execute();
if (work) {
ResultSet rs = this.callableStatement.get().getResultSet();
while (rs.next()) {
addObject(list, rs);
}
rs.close();
} else {
Logger.info("City Placement Failed: " + this.callableStatement.get().toString());
return list; //city creation failure
}
while (this.callableStatement.get().getMoreResults()) {
ResultSet rs = this.callableStatement.get().getResultSet();
while (rs.next()) {
addObject(list, rs);
}
rs.close();
}
} catch (SQLException e) {
Logger.info("City Placement Failed, SQLException: " + this.callableStatement.get().toString() + e.toString());
return list; //city creation failure
} catch (UnknownHostException e) {
Logger.info("City Placement Failed, UnknownHostException: " + this.callableStatement.get().toString());
return list; //city creation failure
} finally {
closeCallable();
}
return list;
}
public static void addObject(ArrayList<AbstractGameObject> list, ResultSet rs) throws SQLException, UnknownHostException { LocalDateTime upgradeTime = LocalDateTime.now().plusHours(2);
String type = rs.getString("type"); ArrayList<AbstractGameObject> objectList = new ArrayList<>();
switch (type) {
case "zone":
Zone zone = new Zone(rs);
DbManager.addToCache(zone);
list.add(zone);
break;
case "building":
Building building = new Building(rs);
DbManager.addToCache(building);
list.add(building);
break;
case "city":
City city = new City(rs);
DbManager.addToCache(city);
list.add(city);
break;
}
}
public ArrayList<City> GET_CITIES_BY_ZONE(final int objectUUID) { try (Connection connection = DbManager.getConnection();
prepareCallable("SELECT `obj_city`.*, `object`.`parent` FROM `obj_city` INNER JOIN `object` ON `object`.`UID` = `obj_city`.`UID` WHERE `object`.`parent`=?;"); PreparedStatement preparedStatement = connection.prepareStatement("CALL `city_CREATE`(?, ?, ?, ?, ?, ?, ?, ?, ?,?,?)")) {
setLong(1, (long) objectUUID);
return getObjectList(); preparedStatement.setLong(1, ownerID); //objectUUID of owning player
} preparedStatement.setLong(2, parentZoneID); //objectUUID of parent (continent) zone
preparedStatement.setLong(3, realmID); //objectUUID of realm city belongs in
preparedStatement.setFloat(4, xCoord); //xOffset from parentZone center
preparedStatement.setFloat(5, yCoord); //yOffset from parentZone center
preparedStatement.setFloat(6, zCoord); //zOffset from parentZone center
preparedStatement.setString(7, name); //city name
preparedStatement.setTimestamp(8, Timestamp.valueOf(established));
preparedStatement.setFloat(9, rotation);
preparedStatement.setFloat(10, W);
preparedStatement.setTimestamp(11, Timestamp.valueOf(upgradeTime));
public City GET_CITY(final int cityId) { boolean work = execute();
City city = (City) DbManager.getFromCache(Enum.GameObjectType.City, cityId);
if (city != null)
return city;
prepareCallable("SELECT `obj_city`.*, `object`.`parent` FROM `obj_city` INNER JOIN `object` ON `object`.`UID` = `obj_city`.`UID` WHERE `object`.`UID`=?;");
setLong(1, (long) cityId);
city = (City) getObjectSingle(cityId);
return city;
}
public String SET_PROPERTY(final City c, String name, Object new_value) { if (work) {
prepareCallable("CALL city_SETPROP(?,?,?)"); ResultSet rs = preparedStatement.getResultSet();
setLong(1, (long) c.getObjectUUID()); while (rs.next()) {
setString(2, name); addObject(objectList, rs);
setString(3, String.valueOf(new_value)); }
return getResult(); rs.close();
} } else {
Logger.info("City Placement Failed: " + preparedStatement);
return objectList; //city creation failure
}
while (preparedStatement.getMoreResults()) {
ResultSet rs = preparedStatement.getResultSet();
while (rs.next()) {
addObject(objectList, rs);
}
rs.close();
}
} catch (SQLException e) {
Logger.error(e);
}
public String SET_PROPERTY(final City c, String name, Object new_value, Object old_value) { return objectList;
prepareCallable("CALL city_GETSETPROP(?,?,?,?)"); }
setLong(1, (long) c.getObjectUUID());
setString(2, name);
setString(3, String.valueOf(new_value));
setString(4, String.valueOf(old_value));
return getResult();
}
public boolean updateforceRename(City city, boolean value) { public ArrayList<City> GET_CITIES_BY_ZONE(final int objectUUID) {
prepareCallable("UPDATE `obj_city` SET `forceRename`=?" ArrayList<City> cityList = new ArrayList<>();
+ " WHERE `UID` = ?");
setByte(1, (value == true) ? (byte) 1 : (byte) 0);
setInt(2, city.getObjectUUID());
return (executeUpdate() > 0);
}
public boolean updateOpenCity(City city, boolean value) { try (Connection connection = DbManager.getConnection();
PreparedStatement preparedStatement = connection.prepareStatement("SELECT `obj_city`.*, `object`.`parent` FROM `obj_city` INNER JOIN `object` ON `object`.`UID` = `obj_city`.`UID` WHERE `object`.`parent`=?;")) {
prepareCallable("UPDATE `obj_city` SET `open`=?" preparedStatement.setLong(1, objectUUID);
+ " WHERE `UID` = ?");
setByte(1, (value == true) ? (byte) 1 : (byte) 0);
setInt(2, city.getObjectUUID());
return (executeUpdate() > 0);
}
public boolean updateTOL(City city, int tolID) { ResultSet rs = preparedStatement.executeQuery();
cityList = getObjectsFromRs(rs, 100);
prepareCallable("UPDATE `obj_city` SET `treeOfLifeUUID`=?" } catch (SQLException e) {
+ " WHERE `UID` = ?"); Logger.error(e);
setInt(1,tolID); }
setInt(2, city.getObjectUUID());
return (executeUpdate() > 0);
}
public boolean renameCity(City city, String name) { return cityList;
}
prepareCallable("UPDATE `obj_city` SET `name`=?" public City GET_CITY(final int cityId) {
+ " WHERE `UID` = ?");
setString(1, name);
setInt(2, city.getObjectUUID());
return (executeUpdate() > 0);
}
public boolean updateSiegesWithstood(City city, int value) { City city = (City) DbManager.getFromCache(Enum.GameObjectType.City, cityId);
prepareCallable("UPDATE `obj_city` SET `siegesWithstood`=?" if (city != null)
+ " WHERE `UID` = ?"); return city;
setInt(1, value);
setInt(2, city.getObjectUUID());
return (executeUpdate() > 0);
}
public boolean updateRealmTaxDate(City city, LocalDateTime localDateTime) { try (Connection connection = DbManager.getConnection();
PreparedStatement preparedStatement = connection.prepareStatement("SELECT `obj_city`.*, `object`.`parent` FROM `obj_city` INNER JOIN `object` ON `object`.`UID` = `obj_city`.`UID` WHERE `object`.`UID`=?;")) {
prepareCallable("UPDATE `obj_city` SET `realmTaxDate` =?" preparedStatement.setLong(1, cityId);
+ " WHERE `UID` = ?");
setLocalDateTime(1, localDateTime); ResultSet rs = preparedStatement.executeQuery();
setInt(2,city.getObjectUUID()); city = (City) getObjectFromRs(rs);
return (executeUpdate() > 0);
} } catch (SQLException e) {
Logger.error(e);
}
return city;
}
public boolean updateforceRename(City city, boolean value) {
try (Connection connection = DbManager.getConnection();
PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_city` SET `forceRename`=?"
+ " WHERE `UID` = ?")) {
preparedStatement.setByte(1, (value == true) ? (byte) 1 : (byte) 0);
preparedStatement.setInt(2, city.getObjectUUID());
return (preparedStatement.executeUpdate() > 0);
} catch (SQLException e) {
Logger.error(e);
return false;
}
}
public boolean updateOpenCity(City city, boolean value) {
try (Connection connection = DbManager.getConnection();
PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_city` SET `open`=?"
+ " WHERE `UID` = ?")) {
preparedStatement.setByte(1, (value == true) ? (byte) 1 : (byte) 0);
preparedStatement.setInt(2, city.getObjectUUID());
return (preparedStatement.executeUpdate() > 0);
} catch (SQLException e) {
Logger.error(e);
return false;
}
}
public boolean updateTOL(City city, int tolID) {
try (Connection connection = DbManager.getConnection();
PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_city` SET `treeOfLifeUUID`=?"
+ " WHERE `UID` = ?")) {
preparedStatement.setInt(1, tolID);
preparedStatement.setInt(2, city.getObjectUUID());
return (preparedStatement.executeUpdate() > 0);
} catch (SQLException e) {
Logger.error(e);
return false;
}
}
public boolean renameCity(City city, String name) {
try (Connection connection = DbManager.getConnection();
PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_city` SET `name`=?"
+ " WHERE `UID` = ?")) {
preparedStatement.setString(1, name);
preparedStatement.setInt(2, city.getObjectUUID());
return (preparedStatement.executeUpdate() > 0);
} catch (SQLException e) {
Logger.error(e);
return false;
}
}
public boolean updateSiegesWithstood(City city, int value) {
try (Connection connection = DbManager.getConnection();
PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_city` SET `name`=?"
+ " WHERE `UID` = ?")) {
preparedStatement.setInt(1, value);
preparedStatement.setInt(2, city.getObjectUUID());
return (preparedStatement.executeUpdate() > 0);
} catch (SQLException e) {
Logger.error(e);
return false;
}
}
public boolean updateRealmTaxDate(City city, LocalDateTime localDateTime) {
try (Connection connection = DbManager.getConnection();
PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_city` SET `realmTaxDate` =?"
+ " WHERE `UID` = ?")) {
preparedStatement.setTimestamp(1, Timestamp.valueOf(localDateTime));
preparedStatement.setInt(2, city.getObjectUUID());
return (preparedStatement.executeUpdate() > 0);
} catch (SQLException e) {
Logger.error(e);
return false;
}
}
} }
+2 -3
View File
@@ -34,7 +34,6 @@ import engine.workthreads.DestroyCityThread;
import engine.workthreads.TransferCityThread; import engine.workthreads.TransferCityThread;
import org.pmw.tinylog.Logger; import org.pmw.tinylog.Logger;
import java.net.UnknownHostException;
import java.sql.ResultSet; import java.sql.ResultSet;
import java.sql.SQLException; import java.sql.SQLException;
import java.time.LocalDateTime; import java.time.LocalDateTime;
@@ -98,9 +97,9 @@ public class City extends AbstractWorldObject {
* ResultSet Constructor * ResultSet Constructor
*/ */
public City(ResultSet rs) throws SQLException, UnknownHostException { public City(ResultSet rs) throws SQLException {
super(rs); super(rs);
try{ try {
this.cityName = rs.getString("name"); this.cityName = rs.getString("name");
this.motto = rs.getString("motto"); this.motto = rs.getString("motto");
this.isNpc = rs.getByte("isNpc"); this.isNpc = rs.getByte("isNpc");